diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2024-03-08 09:47:22 +0100 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2024-03-08 10:53:46 +0100 |
| commit | d6eb77731c45caf6ee7b18d907e9bc44be760e8c (patch) | |
| tree | 39ac9ae96c85ca234a9661120a33900d7ac6e8df /drivers/gpu/drm/msm/msm_io_utils.c | |
| parent | 6a91585edc70009a8075639f12d5d1e1597b8544 (diff) | |
| parent | b9511c6d277c31b13d4f3128eba46f4e0733d734 (diff) | |
Merge drm/drm-next into drm-misc-next
Backmerging to get the latest fixes from drm-next; specifically the
build fix from the patchset at [1]. Also fixes the build by removing
an unused variable from rzg2l_du_vsp_atomic_flush().
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/series/130720/ # 1
Diffstat (limited to 'drivers/gpu/drm/msm/msm_io_utils.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_io_utils.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/msm_io_utils.c b/drivers/gpu/drm/msm/msm_io_utils.c index 59d2788c45104..afedd61c3e288 100644 --- a/drivers/gpu/drm/msm/msm_io_utils.c +++ b/drivers/gpu/drm/msm/msm_io_utils.c @@ -50,6 +50,19 @@ struct clk *msm_clk_get(struct platform_device *pdev, const char *name) return clk; } +void __iomem *msm_ioremap_mdss(struct platform_device *mdss_pdev, + struct platform_device *pdev, + const char *name) +{ + struct resource *res; + + res = platform_get_resource_byname(mdss_pdev, IORESOURCE_MEM, name); + if (!res) + return ERR_PTR(-EINVAL); + + return devm_ioremap_resource(&pdev->dev, res); +} + static void __iomem *_msm_ioremap(struct platform_device *pdev, const char *name, bool quiet, phys_addr_t *psize) { |