Mesa (main): Revert "radeon: hardcode uvd/vce encoder not_referenced value to false"

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 5d0f9228345d353209776c629a113746d3861932
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5d0f9228345d353209776c629a113746d3861932

Author: SureshGuttula <suresh.guttula at amd.corp-partner.google.com>
Date:   Mon May 30 09:41:35 2022 +0530

Revert "radeon: hardcode uvd/vce encoder not_referenced value to false"

This reverts commit 96b276b3270f82ac90baea37301b96f900684860.

This patch enable SVC encoding support on VCE/UVD.

Signed-off-by: Suresh Guttula <suresh.guttula at amd.com>
Reviewed-by: Thong Thai <thong.thai at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16768>

---

 src/gallium/drivers/radeonsi/radeon_uvd_enc.c | 2 +-
 src/gallium/drivers/radeonsi/radeon_vce_52.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/radeon_uvd_enc.c b/src/gallium/drivers/radeonsi/radeon_uvd_enc.c
index 07b75fa7743..2576e8ba13d 100644
--- a/src/gallium/drivers/radeonsi/radeon_uvd_enc.c
+++ b/src/gallium/drivers/radeonsi/radeon_uvd_enc.c
@@ -57,7 +57,7 @@ static void radeon_uvd_enc_get_param(struct radeon_uvd_encoder *enc,
    enc->enc_pic.frame_num = pic->frame_num;
    enc->enc_pic.pic_order_cnt = pic->pic_order_cnt;
    enc->enc_pic.pic_order_cnt_type = pic->pic_order_cnt_type;
-   enc->enc_pic.not_referenced = false;
+   enc->enc_pic.not_referenced = pic->not_referenced;
    enc->enc_pic.is_iframe = (pic->picture_type == PIPE_H2645_ENC_PICTURE_TYPE_IDR) ||
                             (pic->picture_type == PIPE_H2645_ENC_PICTURE_TYPE_I);
 
diff --git a/src/gallium/drivers/radeonsi/radeon_vce_52.c b/src/gallium/drivers/radeonsi/radeon_vce_52.c
index 5f3c9a49706..b9273f9f14a 100644
--- a/src/gallium/drivers/radeonsi/radeon_vce_52.c
+++ b/src/gallium/drivers/radeonsi/radeon_vce_52.c
@@ -169,7 +169,7 @@ void si_vce_52_get_param(struct rvce_encoder *enc, struct pipe_h264_enc_picture_
    enc->enc_pic.pic_order_cnt = pic->pic_order_cnt;
    enc->enc_pic.ref_idx_l0 = pic->ref_idx_l0_list[0];
    enc->enc_pic.ref_idx_l1 = pic->ref_idx_l1_list[0];
-   enc->enc_pic.not_referenced = false;
+   enc->enc_pic.not_referenced = pic->not_referenced;
    if (enc->dual_inst)
       enc->enc_pic.addrmode_arraymode_disrdo_distwoinstants = 0x00000201;
    else