Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9870dc39 authored by Boris Brezillon's avatar Boris Brezillon Committed by Rob Herring
Browse files

drm/panfrost: Make sure a BO is only unmapped when appropriate 



mmu_ops->unmap() will fail when called on a BO that has not been
previously mapped, and the error path in panfrost_ioctl_create_bo()
can call drm_gem_object_put_unlocked() (which in turn calls
panfrost_mmu_unmap()) on a BO that has not been mapped yet.

Keep track of the mapped/unmapped state to avoid such issues.

Fixes: f3ba9122 ("drm/panfrost: Add initial panfrost driver")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190618081343.16927-1-boris.brezillon@collabora.com
parent 48eaeb76

drivers/gpu/drm/panfrost/panfrost_gem.c

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ static void panfrost_gem_free_object(struct drm_gem_object *obj) 
	struct panfrost_gem_object *bo = to_panfrost_bo(obj);

	struct panfrost_device *pfdev = obj->dev->dev_private;



	if (bo->is_mapped)

		panfrost_mmu_unmap(bo);



	spin_lock(&pfdev->mm_lock);

drivers/gpu/drm/panfrost/panfrost_gem.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ struct panfrost_gem_object { 
	struct drm_gem_shmem_object base;



	struct drm_mm_node node;

	bool is_mapped;

};



static inline

drivers/gpu/drm/panfrost/panfrost_mmu.c

+8 −0
Original line number Diff line number Diff line
@@ -156,6 +156,9 @@ int panfrost_mmu_map(struct panfrost_gem_object *bo) 
	struct sg_table *sgt;

	int ret;



	if (WARN_ON(bo->is_mapped))

		return 0;



	sgt = drm_gem_shmem_get_pages_sgt(obj);

	if (WARN_ON(IS_ERR(sgt)))

		return PTR_ERR(sgt);
@@ -189,6 +192,7 @@ int panfrost_mmu_map(struct panfrost_gem_object *bo) 


	pm_runtime_mark_last_busy(pfdev->dev);

	pm_runtime_put_autosuspend(pfdev->dev);

	bo->is_mapped = true;



	return 0;

}
@@ -203,6 +207,9 @@ void panfrost_mmu_unmap(struct panfrost_gem_object *bo) 
	size_t unmapped_len = 0;

	int ret;



	if (WARN_ON(!bo->is_mapped))

		return;



	dev_dbg(pfdev->dev, "unmap: iova=%llx, len=%zx", iova, len);



	ret = pm_runtime_get_sync(pfdev->dev);
@@ -230,6 +237,7 @@ void panfrost_mmu_unmap(struct panfrost_gem_object *bo) 


	pm_runtime_mark_last_busy(pfdev->dev);

	pm_runtime_put_autosuspend(pfdev->dev);

	bo->is_mapped = false;

}



static void mmu_tlb_inv_context_s1(void *cookie)