drm/amd/display: Improve compatibility by re-ordering info-packets

[why]
On DCN20, Some features would not be activated when ALLM was turned on.
TV seemed to activate only the latest info packet sent, and the ALLM
info packet was sent after the VSIF info packet.

The packet indices was also inconsistent between DCN10 and DCN20.

[how]
Change the packet indices of DCN20 to match those of DCN10.
This makes them consistent and also makes the vendor info packet
be sent after the hfvsif info packet.

Signed-off-by: Naveed Ashfaq <Naveed.Ashfaq@amd.com>
Reviewed-by: Anthony Koo <Anthony.Koo@amd.com>
Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c
index 99a7ef6ab878bd958a079fd6279d3a3ab6d5f6be..e3984f02b7b3ed4429b529d3d2bc741e8dec1f88 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c
@@ -152,11 +152,11 @@ static void enc2_stream_encoder_update_hdmi_info_packets(
 
        /*Always add mandatory packets first followed by optional ones*/
        enc2_update_hdmi_info_packet(enc1, 0, &info_frame->avi);
-       enc2_update_hdmi_info_packet(enc1, 5, &info_frame->hfvsif);
+       enc2_update_hdmi_info_packet(enc1, 1, &info_frame->hfvsif);
        enc2_update_hdmi_info_packet(enc1, 2, &info_frame->gamut);
-       enc2_update_hdmi_info_packet(enc1, 1, &info_frame->vendor);
-       enc2_update_hdmi_info_packet(enc1, 3, &info_frame->spd);
-       enc2_update_hdmi_info_packet(enc1, 4, &info_frame->hdrsmd);
+       enc2_update_hdmi_info_packet(enc1, 3, &info_frame->vendor);
+       enc2_update_hdmi_info_packet(enc1, 4, &info_frame->spd);
+       enc2_update_hdmi_info_packet(enc1, 5, &info_frame->hdrsmd);
 }
 
 static void enc2_stream_encoder_stop_hdmi_info_packets(