Commit 6c0e3ea2 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm/gem: Switch over to obj->resv for locking 



This also converts the special msm_gem_get_vaddr_active() to expect the
lock to already be held.  There are two call-sites for this, one already
has the lock held, so it is more straightforward to just open-code the
locking for the other caller.

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Reviewed-by: default avatarKristian H. Kristensen <hoegsberg@google.com>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 9184b683

drivers/gpu/drm/msm/msm_gem.c

+7 −10
Original line number Diff line number Diff line
@@ -643,13 +643,7 @@ void *msm_gem_get_vaddr(struct drm_gem_object *obj) 
 */

void *msm_gem_get_vaddr_active(struct drm_gem_object *obj)

{

	void *ret;



	msm_gem_lock(obj);

	ret = get_vaddr(obj, __MSM_MADV_PURGED);

	msm_gem_unlock(obj);



	return ret;

	return get_vaddr(obj, __MSM_MADV_PURGED);

}



void msm_gem_put_vaddr_locked(struct drm_gem_object *obj)
@@ -969,15 +963,20 @@ static void free_object(struct msm_gem_object *msm_obj) 
		if (msm_obj->pages)

			kvfree(msm_obj->pages);



		/* dma_buf_detach() grabs resv lock, so we need to unlock

		 * prior to drm_prime_gem_destroy

		 */

		msm_gem_unlock(obj);



		drm_prime_gem_destroy(obj, msm_obj->sgt);

	} else {

		msm_gem_vunmap(obj);

		put_pages(obj);

		msm_gem_unlock(obj);

	}



	drm_gem_object_release(obj);



	msm_gem_unlock(obj);

	kfree(msm_obj);

}
@@ -1049,8 +1048,6 @@ static int msm_gem_new_impl(struct drm_device *dev, 
	if (!msm_obj)

		return -ENOMEM;



	mutex_init(&msm_obj->lock);



	msm_obj->flags = flags;

	msm_obj->madv = MSM_MADV_WILLNEED;

drivers/gpu/drm/msm/msm_gem.h

+5 −11
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ struct msm_gem_object { 
	 * an IOMMU.  Also used for stolen/splashscreen buffer.

	 */

	struct drm_mm_node *vram_node;

	struct mutex lock; /* Protects resources associated with bo */



	char name[32]; /* Identifier to print for the debugfs files */
@@ -158,36 +157,31 @@ void msm_gem_describe_objects(struct list_head *list, struct seq_file *m); 
static inline void

msm_gem_lock(struct drm_gem_object *obj)

{

	struct msm_gem_object *msm_obj = to_msm_bo(obj);

	mutex_lock(&msm_obj->lock);

	dma_resv_lock(obj->resv, NULL);

}



static inline bool __must_check

msm_gem_trylock(struct drm_gem_object *obj)

{

	struct msm_gem_object *msm_obj = to_msm_bo(obj);

	return mutex_trylock(&msm_obj->lock) == 1;

	return dma_resv_trylock(obj->resv);

}



static inline int

msm_gem_lock_interruptible(struct drm_gem_object *obj)

{

	struct msm_gem_object *msm_obj = to_msm_bo(obj);

	return mutex_lock_interruptible(&msm_obj->lock);

	return dma_resv_lock_interruptible(obj->resv, NULL);

}



static inline void

msm_gem_unlock(struct drm_gem_object *obj)

{

	struct msm_gem_object *msm_obj = to_msm_bo(obj);

	mutex_unlock(&msm_obj->lock);

	dma_resv_unlock(obj->resv);

}



static inline bool

msm_gem_is_locked(struct drm_gem_object *obj)

{

	struct msm_gem_object *msm_obj = to_msm_bo(obj);

	return mutex_is_locked(&msm_obj->lock);

	return dma_resv_is_locked(obj->resv);

}



static inline bool is_active(struct msm_gem_object *msm_obj)

drivers/gpu/drm/msm/msm_gem_submit.c

+4 −4
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static void submit_unlock_unpin_bo(struct msm_gem_submit *submit, 
	struct msm_gem_object *msm_obj = submit->bos[i].obj;



	if (submit->bos[i].flags & BO_PINNED)

		msm_gem_unpin_iova(&msm_obj->base, submit->aspace);

		msm_gem_unpin_iova_locked(&msm_obj->base, submit->aspace);



	if (submit->bos[i].flags & BO_LOCKED)

		dma_resv_unlock(msm_obj->base.resv);
@@ -324,7 +324,7 @@ static int submit_pin_objects(struct msm_gem_submit *submit) 
		uint64_t iova;



		/* if locking succeeded, pin bo: */

		ret = msm_gem_get_and_pin_iova(&msm_obj->base,

		ret = msm_gem_get_and_pin_iova_locked(&msm_obj->base,

				submit->aspace, &iova);



		if (ret)
@@ -383,7 +383,7 @@ static int submit_reloc(struct msm_gem_submit *submit, struct msm_gem_object *ob 
	/* For now, just map the entire thing.  Eventually we probably

	 * to do it page-by-page, w/ kmap() if not vmap()d..

	 */

	ptr = msm_gem_get_vaddr(&obj->base);

	ptr = msm_gem_get_vaddr_locked(&obj->base);



	if (IS_ERR(ptr)) {

		ret = PTR_ERR(ptr);
@@ -434,7 +434,7 @@ static int submit_reloc(struct msm_gem_submit *submit, struct msm_gem_object *ob 
	}



out:

	msm_gem_put_vaddr(&obj->base);

	msm_gem_put_vaddr_locked(&obj->base);



	return ret;

}

drivers/gpu/drm/msm/msm_gpu.c

+12 −2
Original line number Diff line number Diff line
@@ -323,7 +323,9 @@ static void msm_gpu_crashstate_get_bo(struct msm_gpu_state *state, 
		if (!state_bo->data)

			goto out;



		msm_gem_lock(&obj->base);

		ptr = msm_gem_get_vaddr_active(&obj->base);

		msm_gem_unlock(&obj->base);

		if (IS_ERR(ptr)) {

			kvfree(state_bo->data);

			state_bo->data = NULL;
@@ -467,16 +469,24 @@ static void recover_worker(struct kthread_work *work) 
			put_task_struct(task);

		}



		/* msm_rd_dump_submit() needs bo locked to dump: */

		for (i = 0; i < submit->nr_bos; i++)

			msm_gem_lock(&submit->bos[i].obj->base);



		if (comm && cmd) {

			DRM_DEV_ERROR(dev->dev, "%s: offending task: %s (%s)\n",

				gpu->name, comm, cmd);



			msm_rd_dump_submit(priv->hangrd, submit,

				"offending task: %s (%s)", comm, cmd);

		} else

		} else {

			msm_rd_dump_submit(priv->hangrd, submit, NULL);

		}



		for (i = 0; i < submit->nr_bos; i++)

			msm_gem_unlock(&submit->bos[i].obj->base);

	}



	/* Record the crash state */

	pm_runtime_get_sync(&gpu->pdev->dev);

	msm_gpu_crashstate_capture(gpu, submit, comm, cmd);
@@ -779,7 +789,7 @@ void msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit) 


		/* submit takes a reference to the bo and iova until retired: */

		drm_gem_object_get(&msm_obj->base);

		msm_gem_get_and_pin_iova(&msm_obj->base, submit->aspace, &iova);

		msm_gem_get_and_pin_iova_locked(&msm_obj->base, submit->aspace, &iova);



		if (submit->bos[i].flags & MSM_SUBMIT_BO_WRITE)

			dma_resv_add_excl_fence(drm_obj->resv, submit->fence);

drivers/gpu/drm/msm/msm_rd.c

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ static void snapshot_buf(struct msm_rd_state *rd, 


	rd_write_section(rd, RD_BUFFER_CONTENTS, buf, size);



	msm_gem_put_vaddr(&obj->base);

	msm_gem_put_vaddr_locked(&obj->base);

}



/* called under struct_mutex */

CRA Git | Maintained and supported by SUSTech CRA and CCSE