Commit e4f020c6 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm: Switch idr_lock to spinlock 



Needed to idr_preload() which returns with preemption disabled.

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Patchwork: https://patchwork.freedesktop.org/patch/527846/
Link: https://lore.kernel.org/r/20230320144356.803762-11-robdclark@gmail.com
parent 17b704f1

drivers/gpu/drm/msm/msm_drv.c

+2 −4
Original line number Diff line number Diff line
@@ -918,13 +918,11 @@ static int wait_fence(struct msm_gpu_submitqueue *queue, uint32_t fence_id, 
	 * retired, so if the fence is not found it means there is nothing

	 * to wait for

	 */

	ret = mutex_lock_interruptible(&queue->idr_lock);

	if (ret)

		return ret;

	spin_lock(&queue->idr_lock);

	fence = idr_find(&queue->fence_idr, fence_id);

	if (fence)

		fence = dma_fence_get_rcu(fence);

	mutex_unlock(&queue->idr_lock);

	spin_unlock(&queue->idr_lock);



	if (!fence)

		return 0;

drivers/gpu/drm/msm/msm_gem_submit.c

+5 −5
Original line number Diff line number Diff line
@@ -80,9 +80,9 @@ void __msm_gem_submit_destroy(struct kref *kref) 
	unsigned i;



	if (submit->fence_id) {

		mutex_lock(&submit->queue->idr_lock);

		spin_lock(&submit->queue->idr_lock);

		idr_remove(&submit->queue->fence_idr, submit->fence_id);

		mutex_unlock(&submit->queue->idr_lock);

		spin_unlock(&submit->queue->idr_lock);

	}



	dma_fence_put(submit->user_fence);
@@ -882,7 +882,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, 


	submit->nr_cmds = i;



	mutex_lock(&queue->idr_lock);

	spin_lock(&queue->idr_lock);



	/*

	 * If using userspace provided seqno fence, validate that the id
@@ -892,7 +892,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, 
	 */

	if ((args->flags & MSM_SUBMIT_FENCE_SN_IN) &&

			idr_find(&queue->fence_idr, args->fence)) {

		mutex_unlock(&queue->idr_lock);

		spin_unlock(&queue->idr_lock);

		ret = -EINVAL;

		goto out;

	}
@@ -926,7 +926,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, 
						    INT_MAX, GFP_KERNEL);

	}



	mutex_unlock(&queue->idr_lock);

	spin_unlock(&queue->idr_lock);



	if (submit->fence_id < 0) {

		ret = submit->fence_id;

drivers/gpu/drm/msm/msm_gpu.h

+1 −1
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ struct msm_gpu_submitqueue { 
	struct msm_file_private *ctx;

	struct list_head node;

	struct idr fence_idr;

	struct mutex idr_lock;

	struct spinlock idr_lock;

	struct mutex lock;

	struct kref ref;

	struct drm_sched_entity *entity;

drivers/gpu/drm/msm/msm_submitqueue.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ int msm_submitqueue_create(struct drm_device *drm, struct msm_file_private *ctx, 
		*id = queue->id;



	idr_init(&queue->fence_idr);

	mutex_init(&queue->idr_lock);

	spin_lock_init(&queue->idr_lock);

	mutex_init(&queue->lock);



	list_add_tail(&queue->node, &ctx->submitqueues);