From 9197dba8bc250961a7ab2bf82808a6bb31fdbc28 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Sat, 16 Sep 2023 16:15:50 +0200 Subject: [PATCH] radeonsi/vcn: Don't hang GPU when using DCC surface as encoder input Using DCC surface as encoder input will result in corrupted image in the video, but early returning here will instead hang GPU. Replace return with assert. Reviewed-by: Leo Liu Part-of: --- src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c | 2 +- src/gallium/drivers/radeonsi/radeon_vcn_enc_4_0.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c b/src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c index 9aff8fbe545..b74ecc9e812 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c @@ -1222,7 +1222,7 @@ static void radeon_enc_encode_params(struct radeon_encoder *enc) if (enc->luma->meta_offset) { RVID_ERR("DCC surfaces not supported.\n"); - return; + assert(false); } enc->enc_pic.enc_params.allowed_max_bitstream_size = enc->bs_size; diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc_4_0.c b/src/gallium/drivers/radeonsi/radeon_vcn_enc_4_0.c index 4a9ee9c7589..99b0edc04ae 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_enc_4_0.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn_enc_4_0.c @@ -887,7 +887,7 @@ static void radeon_enc_av1_encode_params(struct radeon_encoder *enc) if (enc->luma->meta_offset) { RVID_ERR("DCC surfaces not supported.\n"); - return; + assert(false); } enc->enc_pic.enc_params.allowed_max_bitstream_size = enc->bs_size;