From 4cb6094f2e51250ab96a6c7601c493b3b5f0aa41 Mon Sep 17 00:00:00 2001 From: Yinjie Yao Date: Wed, 13 Aug 2025 17:52:09 -0400 Subject: [PATCH] ac,radeonsi/vcn: Use correct swizzle_mode for vcn4 On VCN4 SWIZZLE_MODE_8x8_1D_THIN_12_24BPP use different value than previous VCN generations Signed-off-by: Yinjie Yao Reviewed-by: Ruijing Dong Part-of: --- src/amd/common/ac_vcn_enc.h | 1 + src/gallium/drivers/radeonsi/radeon_vcn_enc_4_0.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/amd/common/ac_vcn_enc.h b/src/amd/common/ac_vcn_enc.h index 46555a0befa..a09c7c39428 100644 --- a/src/amd/common/ac_vcn_enc.h +++ b/src/amd/common/ac_vcn_enc.h @@ -197,6 +197,7 @@ #define RENCODE_REC_SWIZZLE_MODE_256B_S 1 #define RENCODE_REC_SWIZZLE_MODE_256B_D 2 #define RENCODE_REC_SWIZZLE_MODE_8x8_1D_THIN_12_24BPP 0x10000001 +#define RENCODE_REC_SWIZZLE_MODE_8x8_1D_THIN_12_24BPP_VCN4 0x10000000 #define RENCODE_REC_SWIZZLE_MODE_256B_D_VCN5 1 #define RENCODE_VIDEO_BITSTREAM_BUFFER_MODE_LINEAR 0 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 8dfa35c555a..f8da40c665a 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_enc_4_0.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn_enc_4_0.c @@ -644,7 +644,7 @@ static uint32_t radeon_enc_ref_swizzle_mode(struct radeon_encoder *enc) { /* return RENCODE_REC_SWIZZLE_MODE_LINEAR; for debugging purpose */ if (enc->enc_pic.bit_depth_luma_minus8 != 0) - return RENCODE_REC_SWIZZLE_MODE_8x8_1D_THIN_12_24BPP; + return RENCODE_REC_SWIZZLE_MODE_8x8_1D_THIN_12_24BPP_VCN4; else return RENCODE_REC_SWIZZLE_MODE_256B_D; }