Module: Mesa Branch: main Commit: 9d1e69ca451189d20b04c9bb4b7977d49c4e68a9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9d1e69ca451189d20b04c9bb4b7977d49c4e68a9
Author: Ruijing Dong <ruijing.d...@amd.com> Date: Mon Jan 8 15:39:16 2024 -0500 radeonsi/vcn: update session_info from vcn3 and up. session_info needs to be updated to vcn4 and up, since it is safe to change it from vcn3 to cover all the needed VCNs, thus this change came from VCN3. Reviewed-by: Leo Liu <leo....@amd.com> Reviewed-by: Boyuan Zhang <boyuan.zh...@amd.com> Signed-off-by: Ruijing Dong <ruijing.d...@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26940> --- src/gallium/drivers/radeonsi/radeon_vcn_enc_3_0.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc_3_0.c b/src/gallium/drivers/radeonsi/radeon_vcn_enc_3_0.c index 1ca0110c04e..7288bb1e5db 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_enc_3_0.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn_enc_3_0.c @@ -19,6 +19,15 @@ #define RENCODE_FW_INTERFACE_MAJOR_VERSION 1 #define RENCODE_FW_INTERFACE_MINOR_VERSION 20 +static void radeon_enc_session_info(struct radeon_encoder *enc) +{ + RADEON_ENC_BEGIN(enc->cmd.session_info); + RADEON_ENC_CS(enc->enc_pic.session_info.interface_version); + RADEON_ENC_READWRITE(enc->si->res->buf, enc->si->res->domains, 0x0); + RADEON_ENC_CS(0); /* padding 0, not used for vcn3 */ + RADEON_ENC_END(); +} + static void radeon_enc_spec_misc(struct radeon_encoder *enc) { enc->enc_pic.spec_misc.constrained_intra_pred_flag = 0; @@ -521,6 +530,7 @@ void radeon_enc_3_0_init(struct radeon_encoder *enc) { radeon_enc_2_0_init(enc); + enc->session_info = radeon_enc_session_info; enc->session_init = radeon_enc_session_init; enc->ctx = radeon_enc_ctx; enc->quality_params = radeon_enc_quality_params;
