drm/amd/display: fix Infoframe byte 28-31 doesn't get written out to register

Signed-off-by: Tony Cheng <tony.cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
index 8156c6a8ff5df5aac528ffee4bcc9c43ba326bad..c510e95eb948dbed3d44b7323ee842e98d05b8a5 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
@@ -137,8 +137,8 @@ static void dce110_update_generic_info_packet(
                REG_WRITE(AFMT_GENERIC_3, *content++);
                REG_WRITE(AFMT_GENERIC_4, *content++);
                REG_WRITE(AFMT_GENERIC_5, *content++);
-               REG_WRITE(AFMT_GENERIC_6, *content);
-               REG_WRITE(AFMT_GENERIC_7, 0);
+               REG_WRITE(AFMT_GENERIC_6, *content++);
+               REG_WRITE(AFMT_GENERIC_7, *content);
        }
 
        if (!REG(AFMT_VBI_PACKET_CONTROL1)) {

diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h b/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h
index 8b4a30459eeb4334bfea6834c705bdfd1015917f..cb369af29d69c3a9a86412011b8e59b5c58361c6 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h
@@ -19,7 +19,7 @@ struct encoder_info_packet {
        uint8_t hb1;
        uint8_t hb2;
        uint8_t hb3;
-       uint8_t sb[28];
+       uint8_t sb[32];
 };
 
 struct encoder_info_frame {