Mesa (main): Revert "radeonsi: Set display_remote for non-refernced frames"

[GitLab Mirror]

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

Author: SureshGuttula <suresh.guttula at amd.corp-partner.google.com>
Date:   Fri May 27 16:37:42 2022 +0530

Revert "radeonsi: Set display_remote for non-refernced frames"

This reverts commit ef76b83633dc34eefed11f295cb3185c3991fecd.
Reason for revert: This only helps in using I MBs.To further
fix in dpb , reverting this.

Fix added : https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16745

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

---

 src/gallium/drivers/radeonsi/radeon_vcn_enc.c     | 6 +-----
 src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc.c b/src/gallium/drivers/radeonsi/radeon_vcn_enc.c
index e18fb89d236..0ae9b9ce881 100644
--- a/src/gallium/drivers/radeonsi/radeon_vcn_enc.c
+++ b/src/gallium/drivers/radeonsi/radeon_vcn_enc.c
@@ -357,7 +357,6 @@ static void radeon_enc_begin_frame(struct pipe_video_codec *encoder,
    struct radeon_encoder *enc = (struct radeon_encoder *)encoder;
    struct vl_video_buffer *vid_buf = (struct vl_video_buffer *)source;
    bool need_rate_control = false;
-   bool not_ref = false;
 
    if (u_reduce_video_profile(enc->base.profile) == PIPE_VIDEO_FORMAT_MPEG4_AVC) {
       struct pipe_h264_enc_picture_desc *pic = (struct pipe_h264_enc_picture_desc *)picture;
@@ -365,9 +364,6 @@ static void radeon_enc_begin_frame(struct pipe_video_codec *encoder,
          (enc->enc_pic.rc_layer_init[0].target_bit_rate != pic->rate_ctrl[0].target_bitrate) ||
          (enc->enc_pic.rc_layer_init[0].frame_rate_num != pic->rate_ctrl[0].frame_rate_num) ||
          (enc->enc_pic.rc_layer_init[0].frame_rate_den != pic->rate_ctrl[0].frame_rate_den);
-
-      if (enc->enc_pic.not_referenced != pic->not_referenced)
-         not_ref = true;
    } else if (u_reduce_video_profile(picture->profile) == PIPE_VIDEO_FORMAT_HEVC) {
       struct pipe_h265_enc_picture_desc *pic = (struct pipe_h265_enc_picture_desc *)picture;
       need_rate_control = enc->enc_pic.rc_layer_init[0].target_bit_rate != pic->rc.target_bitrate;
@@ -399,7 +395,7 @@ static void radeon_enc_begin_frame(struct pipe_video_codec *encoder,
       flush(enc);
       si_vid_destroy_buffer(&fb);
    }
-   if (need_rate_control || not_ref) {
+   if (need_rate_control) {
       enc->begin(enc);
       flush(enc);
    }
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 f0bd7fc792e..c208ac77fa4 100644
--- a/src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c
+++ b/src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c
@@ -104,11 +104,7 @@ static void radeon_enc_session_init(struct radeon_encoder *enc)
       enc->enc_pic.session_init.aligned_picture_height - enc->base.height;
    enc->enc_pic.session_init.pre_encode_mode = RENCODE_PREENCODE_MODE_NONE;
    enc->enc_pic.session_init.pre_encode_chroma_enabled = false;
-
-   if (enc->enc_pic.not_referenced)
-      enc->enc_pic.session_init.display_remote = 1;
-   else
-      enc->enc_pic.session_init.display_remote = 0;
+   enc->enc_pic.session_init.display_remote = 0;
 
    RADEON_ENC_BEGIN(enc->cmd.session_init);
    RADEON_ENC_CS(enc->enc_pic.session_init.encode_standard);