From 6b474e06a210ab2045250035f5e135f7fb39eff2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christian=20K=C3=B6nig?= Date: Thu, 7 Jul 2016 11:22:32 +0200 Subject: [PATCH] radeon/uvd: fix contex buffer destruction in the error path MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Destroying a not allocated buffer is harmless. Signed-off-by: Christian König Reviewed-by: Leo Liu --- src/gallium/drivers/radeon/radeon_uvd.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/radeon/radeon_uvd.c b/src/gallium/drivers/radeon/radeon_uvd.c index 52658fa2393..275d8266c22 100644 --- a/src/gallium/drivers/radeon/radeon_uvd.c +++ b/src/gallium/drivers/radeon/radeon_uvd.c @@ -937,10 +937,7 @@ static void ruvd_destroy(struct pipe_video_codec *decoder) } rvid_destroy_buffer(&dec->dpb); - if ((u_reduce_video_profile(dec->base.profile) == PIPE_VIDEO_FORMAT_HEVC) || - (dec->stream_type == RUVD_CODEC_H264_PERF && - ((struct r600_common_screen*)dec->screen)->family >= CHIP_POLARIS10)) - rvid_destroy_buffer(&dec->ctx); + rvid_destroy_buffer(&dec->ctx); FREE(dec); } @@ -1288,8 +1285,7 @@ error: } rvid_destroy_buffer(&dec->dpb); - if (dec->stream_type == RUVD_CODEC_H264_PERF && info.family >= CHIP_POLARIS10) - rvid_destroy_buffer(&dec->ctx); + rvid_destroy_buffer(&dec->ctx); FREE(dec); -- 2.30.2