releases/4.19.9/drm-msm-move-fence-put-to-where-failure-occurs.patch

   1 From 2189463dba3eac10d7264a40ede12fc1a3c06fb1 Mon Sep 17 00:00:00 2001
   2 From: Robert Foss <robert.foss@collabora.com>
   3 Date: Mon, 5 Nov 2018 11:13:12 +0100
   4 Subject: drm/msm: Move fence put to where failure occurs
   5
   6 From: Robert Foss <robert.foss@collabora.com>
   7
   8 commit 2189463dba3eac10d7264a40ede12fc1a3c06fb1 upstream.
   9
  10 If dma_fence_wait fails to wait for a supplied in-fence in
  11 msm_ioctl_gem_submit, make sure we release that in-fence.
  12
  13 Also remove this dma_fence_put() from the 'out' label.
  14
  15 Signed-off-by: Robert Foss <robert.foss@collabora.com>
  16 Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
  17 Cc: stable@vger.kernel.org
  18 Signed-off-by: Rob Clark <robdclark@gmail.com>
  19 Signed-off-by: Sean Paul <seanpaul@chromium.org>
  20 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  21
  22 ---
  23  drivers/gpu/drm/msm/msm_gem_submit.c |   15 ++++++++-------
  24  1 file changed, 8 insertions(+), 7 deletions(-)
  25
  26 --- a/drivers/gpu/drm/msm/msm_gem_submit.c
  27 +++ b/drivers/gpu/drm/msm/msm_gem_submit.c
  28 @@ -410,7 +410,6 @@ int msm_ioctl_gem_submit(struct drm_devi
  29         struct msm_file_private *ctx = file->driver_priv;
  30         struct msm_gem_submit *submit;
  31         struct msm_gpu *gpu = priv->gpu;
  32 -       struct dma_fence *in_fence = NULL;
  33         struct sync_file *sync_file = NULL;
  34         struct msm_gpu_submitqueue *queue;
  35         struct msm_ringbuffer *ring;
  36 @@ -443,6 +442,8 @@ int msm_ioctl_gem_submit(struct drm_devi
  37         ring = gpu->rb[queue->prio];
  38
  39         if (args->flags & MSM_SUBMIT_FENCE_FD_IN) {
  40 +               struct dma_fence *in_fence;
  41 +
  42                 in_fence = sync_file_get_fence(args->fence_fd);
  43
  44                 if (!in_fence)
  45 @@ -452,11 +453,13 @@ int msm_ioctl_gem_submit(struct drm_devi
  46                  * Wait if the fence is from a foreign context, or if the fence
  47                  * array contains any fence from a foreign context.
  48                  */
  49 -               if (!dma_fence_match_context(in_fence, ring->fctx->context)) {
  50 +               ret = 0;
  51 +               if (!dma_fence_match_context(in_fence, ring->fctx->context))
  52                         ret = dma_fence_wait(in_fence, true);
  53 -                       if (ret)
  54 -                               return ret;
  55 -               }
  56 +
  57 +               dma_fence_put(in_fence);
  58 +               if (ret)
  59 +                       return ret;
  60         }
  61
  62         ret = mutex_lock_interruptible(&dev->struct_mutex);
  63 @@ -582,8 +585,6 @@ int msm_ioctl_gem_submit(struct drm_devi
  64         }
  65
  66  out:
  67 -       if (in_fence)
  68 -               dma_fence_put(in_fence);
  69         submit_cleanup(submit);
  70         if (ret)
  71                 msm_gem_submit_free(submit);