From 6fb42ee7a632e181160ac4be234b30e50a1b91d5 Mon Sep 17 00:00:00 2001 From: Christian König Date: Wed, 13 Aug 2014 15:49:18 +0200 Subject: st/vdpau: add device reference counting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes an issue with flash where it tries to destroy a decoder after already destroying the device associated with the decoder. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=82517 Signed-off-by: Christian König Acked-by: Ilia Mirkin --- src/gallium/state_trackers/vdpau/decode.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/gallium/state_trackers/vdpau/decode.c') diff --git a/src/gallium/state_trackers/vdpau/decode.c b/src/gallium/state_trackers/vdpau/decode.c index 1e5f81e22e7..767d3114125 100644 --- a/src/gallium/state_trackers/vdpau/decode.c +++ b/src/gallium/state_trackers/vdpau/decode.c @@ -110,7 +110,7 @@ vlVdpDecoderCreate(VdpDevice device, return VDP_STATUS_RESOURCES; } - vldecoder->device = dev; + DeviceReference(&vldecoder->device, dev); templat.entrypoint = PIPE_VIDEO_ENTRYPOINT_BITSTREAM; templat.chroma_format = PIPE_VIDEO_CHROMA_FORMAT_420; @@ -141,6 +141,7 @@ error_handle: error_decoder: pipe_mutex_unlock(dev->mutex); + DeviceReference(&vldecoder->device, NULL); FREE(vldecoder); return ret; } @@ -163,6 +164,7 @@ vlVdpDecoderDestroy(VdpDecoder decoder) pipe_mutex_destroy(vldecoder->mutex); vlRemoveDataHTAB(decoder); + DeviceReference(&vldecoder->device, NULL); FREE(vldecoder); return VDP_STATUS_OK; -- cgit v1.2.3