[Mesa-dev] [PATCH 2/2] st/vdpau: release held lock in error path

[Grazvydas Ignotas]

Signed-off-by: Grazvydas Ignotas 
---
 src/gallium/state_trackers/vdpau/surface.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/vdpau/surface.c 
b/src/gallium/state_trackers/vdpau/surface.c
index c678eb7..012d303 100644
--- a/src/gallium/state_trackers/vdpau/surface.c
+++ b/src/gallium/state_trackers/vdpau/surface.c
@@ -367,12 +367,14 @@ vlVdpVideoSurfacePutBitsYCbCr(VdpVideoSurface surface,
 
if (pformat != p_surf->video_buffer->buffer_format) {
   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);
if (!sampler_views) {
   mtx_unlock(&p_surf->device->mutex);
-- 
2.7.4

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 2/2] st/vdpau: release held lock in error path

[Grazvydas Ignotas]

Anyone cares about vdpau?

Gražvydas

On Tue, Jan 16, 2018 at 12:03 AM, Grazvydas Ignotas  wrote:
> Signed-off-by: Grazvydas Ignotas 
> ---
>  src/gallium/state_trackers/vdpau/surface.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/src/gallium/state_trackers/vdpau/surface.c 
> b/src/gallium/state_trackers/vdpau/surface.c
> index c678eb7..012d303 100644
> --- a/src/gallium/state_trackers/vdpau/surface.c
> +++ b/src/gallium/state_trackers/vdpau/surface.c
> @@ -367,12 +367,14 @@ vlVdpVideoSurfacePutBitsYCbCr(VdpVideoSurface surface,
>
> if (pformat != p_surf->video_buffer->buffer_format) {
>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);
> if (!sampler_views) {
>mtx_unlock(&p_surf->device->mutex);
> --
> 2.7.4
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 2/2] st/vdpau: release held lock in error path

[Christian König]

Sorry, my Reviewed-by accounted for both patches in this series.

Christian.

Am 19.01.2018 um 00:23 schrieb Grazvydas Ignotas:

Anyone cares about vdpau?

Gražvydas

On Tue, Jan 16, 2018 at 12:03 AM, Grazvydas Ignotas  wrote:

Signed-off-by: Grazvydas Ignotas 
---
  src/gallium/state_trackers/vdpau/surface.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/vdpau/surface.c 
b/src/gallium/state_trackers/vdpau/surface.c
index c678eb7..012d303 100644
--- a/src/gallium/state_trackers/vdpau/surface.c
+++ b/src/gallium/state_trackers/vdpau/surface.c
@@ -367,12 +367,14 @@ vlVdpVideoSurfacePutBitsYCbCr(VdpVideoSurface surface,

 if (pformat != p_surf->video_buffer->buffer_format) {
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);
 if (!sampler_views) {
mtx_unlock(&p_surf->device->mutex);
--
2.7.4


___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev