Commit 8490cad4 authored by Steven Price's avatar Steven Price Committed by Heiko Stuebner
Browse files

drm/rockchip: Detach from ARM DMA domain in attach_device 



Since commit 1ea2a07a ("iommu: Add DMA ownership management
interfaces") the Rockchip display driver on the Firefly RK3288 fails to
initialise properly. This is because ARM DMA domain is still attached.

Let's follow the lead of exynos and tegra and add code to explicitly
remove the ARM domain before attaching a new one.

Fixes: 1ea2a07a ("iommu: Add DMA ownership management interfaces")
Suggested-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarSteven Price <steven.price@arm.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20220615154830.555422-1-steven.price@arm.com
parent 1dbc790b

drivers/gpu/drm/rockchip/rockchip_drm_drv.c

+17 −0
Original line number Diff line number Diff line
@@ -23,6 +23,14 @@ 
#include <drm/drm_probe_helper.h>

#include <drm/drm_vblank.h>



#if defined(CONFIG_ARM_DMA_USE_IOMMU)

#include <asm/dma-iommu.h>

#else

#define arm_iommu_detach_device(...)	({ })

#define arm_iommu_release_mapping(...)	({ })

#define to_dma_iommu_mapping(dev) NULL

#endif



#include "rockchip_drm_drv.h"

#include "rockchip_drm_fb.h"

#include "rockchip_drm_gem.h"
@@ -49,6 +57,15 @@ int rockchip_drm_dma_attach_device(struct drm_device *drm_dev, 
	if (!private->domain)

		return 0;



	if (IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU)) {

		struct dma_iommu_mapping *mapping = to_dma_iommu_mapping(dev);



		if (mapping) {

			arm_iommu_detach_device(dev);

			arm_iommu_release_mapping(mapping);

		}

	}



	ret = iommu_attach_device(private->domain, dev);

	if (ret) {

		DRM_DEV_ERROR(dev, "Failed to attach iommu device\n");