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

Commit 2abdfe24 authored by Robert Foss's avatar Robert Foss Committed by Greg Kroah-Hartman
Browse files

drm/msm: Move fence put to where failure occurs 



commit 2189463dba3eac10d7264a40ede12fc1a3c06fb1 upstream.

If dma_fence_wait fails to wait for a supplied in-fence in
msm_ioctl_gem_submit, make sure we release that in-fence.

Also remove this dma_fence_put() from the 'out' label.

Signed-off-by: default avatarRobert Foss <robert.foss@collabora.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 318f6e59

drivers/gpu/drm/msm/msm_gem_submit.c

+8 −7
Original line number Diff line number Diff line
@@ -410,7 +410,6 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, 
	struct msm_file_private *ctx = file->driver_priv;

	struct msm_gem_submit *submit;

	struct msm_gpu *gpu = priv->gpu;

	struct dma_fence *in_fence = NULL;

	struct sync_file *sync_file = NULL;

	struct msm_gpu_submitqueue *queue;

	struct msm_ringbuffer *ring;
@@ -443,6 +442,8 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, 
	ring = gpu->rb[queue->prio];



	if (args->flags & MSM_SUBMIT_FENCE_FD_IN) {

		struct dma_fence *in_fence;



		in_fence = sync_file_get_fence(args->fence_fd);



		if (!in_fence)
@@ -452,12 +453,14 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, 
		 * Wait if the fence is from a foreign context, or if the fence

		 * array contains any fence from a foreign context.

		 */

		if (!dma_fence_match_context(in_fence, ring->fctx->context)) {

		ret = 0;

		if (!dma_fence_match_context(in_fence, ring->fctx->context))

			ret = dma_fence_wait(in_fence, true);



		dma_fence_put(in_fence);

		if (ret)

			return ret;

	}

	}



	ret = mutex_lock_interruptible(&dev->struct_mutex);

	if (ret)
@@ -582,8 +585,6 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, 
	}



out:

	if (in_fence)

		dma_fence_put(in_fence);

	submit_cleanup(submit);

	if (ret)

		msm_gem_submit_free(submit);