Re: [PATCH v3] drm/msm: Move fence put to where failure occurs

[Robert Foss <robert.foss@collabora.com>]

Hey,

I think this patch is ready for inclusion.


Rob.

On 2018-11-05 11:13, Robert Foss wrote:
> 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: Robert Foss <robert.foss@collabora.com>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: stable@vger.kernel.org
> ---
> 
> Changes since v2:
>   - Chris Wilson: Added r-b and stable kernel tag
> 
> Changes since v1:
>   - Chris Wilson: Make sure that dma_fence_put() is always executed
> 
> 
>   drivers/gpu/drm/msm/msm_gem_submit.c | 15 ++++++++-------
>   1 file changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
> index a90aedd6883a..d5e6665a4c8f 100644
> --- a/drivers/gpu/drm/msm/msm_gem_submit.c
> +++ b/drivers/gpu/drm/msm/msm_gem_submit.c
> @@ -411,7 +411,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;
> @@ -444,6 +443,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)
> @@ -453,11 +454,13 @@ 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);
> -			if (ret)
> -				return ret;
> -		}
> +
> +		dma_fence_put(in_fence);
> +		if (ret)
> +			return ret;
>   	}
>   
>   	ret = mutex_lock_interruptible(&dev->struct_mutex);
> @@ -583,8 +586,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);
>