Commit d8c07bee authored by Lu Baolu's avatar Lu Baolu Committed by Lyude Paul
Browse files

drm/rockchip: Use iommu_paging_domain_alloc() 



Commit <421be3ee> ("drm/rockchip: Refactor IOMMU initialisation") has
refactored rockchip_drm_init_iommu() to pass a device that the domain is
allocated for. Replace iommu_domain_alloc() with
iommu_paging_domain_alloc() to retire the former.

Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Acked-by: default avatarAndy Yan <andyshrk@163.com>
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240902014700.66095-3-baolu.lu@linux.intel.com
parent 8c7c44be

drivers/gpu/drm/rockchip/rockchip_drm_drv.c

+7 −3
Original line number Diff line number Diff line
@@ -103,13 +103,17 @@ static int rockchip_drm_init_iommu(struct drm_device *drm_dev) 
	struct rockchip_drm_private *private = drm_dev->dev_private;

	struct iommu_domain_geometry *geometry;

	u64 start, end;

	int ret;



	if (IS_ERR_OR_NULL(private->iommu_dev))

		return 0;



	private->domain = iommu_domain_alloc(private->iommu_dev->bus);

	if (!private->domain)

		return -ENOMEM;

	private->domain = iommu_paging_domain_alloc(private->iommu_dev);

	if (IS_ERR(private->domain)) {

		ret = PTR_ERR(private->domain);

		private->domain = NULL;

		return ret;

	}



	geometry = &private->domain->geometry;

	start = geometry->aperture_start;