From e048d6204c02c91241766e6105269d14315023a5 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Wed, 20 Aug 2025 15:51:57 +0200 Subject: [PATCH] radeonsi/vcn: Disable H264 encode 8x8 transform when CABAC is disabled VCN5 only supports it with CABAC enabled. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13029 Fixes: e509139f61a ("radeonsi/vcn: Add support for H264 8x8 transform on VCN5") Reviewed-by: Ruijing Dong Part-of: (cherry picked from commit 2e400fc09936a9e40d45562dce8869a69bb1c707) --- .pick_status.json | 2 +- src/gallium/drivers/radeonsi/radeon_vcn_enc.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index d24b94e7f53..2b2c0d1ecd5 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -6224,7 +6224,7 @@ "description": "radeonsi/vcn: Disable H264 encode 8x8 transform when CABAC is disabled", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "e509139f61a2b517ab7e4d08cafd227c2a149aa3", "notes": null diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc.c b/src/gallium/drivers/radeonsi/radeon_vcn_enc.c index 2fb433efc56..ca5a242b8fe 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_enc.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn_enc.c @@ -302,6 +302,7 @@ static void radeon_vcn_enc_h264_get_spec_misc_param(struct radeon_encoder *enc, pic->pic_ctrl.weighted_bipred_idc : 0; enc->enc_pic.spec_misc.transform_8x8_mode = sscreen->info.vcn_ip_version >= VCN_5_0_0 && + enc->enc_pic.spec_misc.cabac_enable && pic->pic_ctrl.transform_8x8_mode_flag; enc->enc_pic.spec_misc.level_idc = pic->seq.level_idc; }