]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/rockchip: Set VOP for the DRM DMA device
authorDmitry Osipenko <dmitry.osipenko@collabora.com>
Wed, 22 Oct 2025 16:19:48 +0000 (19:19 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 8 Jan 2026 09:17:16 +0000 (10:17 +0100)
commit 7d7bb790aced3b1b8550b74e02fdfc001d044bee upstream.

Use VOP for DMA operations performed by DRM core. Rockchip DRM driver
is backed by a virtual device that isn't IOMMU-capable, while VOP is the
actual display controller device backed by IOMMU. Fixes "swiotlb buffer
is full" warning messages originated from GEM prime code paths.

Note, that backporting is non-trivial as this depends on
commit 143ec8d3f9396 ("drm/prime: Support dedicated DMA device for dma-buf
imports"), which landed in v6.16 and commit 421be3ee36a4 ("drm/rockchip:
Refactor IOMMU initialisation"), which landed in v5.19.

Reported-by: Daniel Stone <daniels@collabora.com>
Fixes: 2048e3286f34 ("drm: rockchip: Add basic drm driver")
Cc: stable@vger.kernel.org # v6.16+
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Tested-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://lore.kernel.org/r/20251022161948.199731-1-dmitry.osipenko@collabora.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/rockchip/rockchip_drm_drv.c

index eb77bde9f6283c2216851d812cf2fea50c8c9ac1..e693160e9b7f569aced23ae68a31ddc39813684a 100644 (file)
@@ -96,6 +96,9 @@ void rockchip_drm_dma_init_device(struct drm_device *drm_dev,
                private->iommu_dev = ERR_PTR(-ENODEV);
        else if (!private->iommu_dev)
                private->iommu_dev = dev;
+
+       if (!IS_ERR(private->iommu_dev))
+               drm_dev_set_dma_dev(drm_dev, private->iommu_dev);
 }
 
 static int rockchip_drm_init_iommu(struct drm_device *drm_dev)