From: Grazvydas Ignotas <notasas@gmail.com>
Date: Mon, 15 Jan 2018 22:00:33 +0000 (+0200)
Subject: st/vdpau: release held lock in error path
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e6abc613e2a78c01d1e79e4cd3be79e58d52eac2;p=mesa.git

st/vdpau: release held lock in error path

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Cc: mesa-stable@lists.freedesktop.org
---

diff --git a/src/gallium/state_trackers/vdpau/surface.c b/src/gallium/state_trackers/vdpau/surface.c
index c678eb70377..012d3036411 100644
--- a/src/gallium/state_trackers/vdpau/surface.c
+++ b/src/gallium/state_trackers/vdpau/surface.c
@@ -369,8 +369,10 @@ vlVdpVideoSurfacePutBitsYCbCr(VdpVideoSurface surface,
       if (pformat == PIPE_FORMAT_YV12 &&
           p_surf->video_buffer->buffer_format == PIPE_FORMAT_NV12)
          conversion = CONVERSION_YV12_TO_NV12;
-      else
+      else {
+         mtx_unlock(&p_surf->device->mutex);
          return VDP_STATUS_NO_IMPLEMENTATION;
+      }
    }
 
    sampler_views = p_surf->video_buffer->get_sampler_view_planes(p_surf->video_buffer);