drm/amd/display: Correct values in AVI infoframe

[Why]
While displaying 4k modes defined in HDMI1.4b, should set VIC to 0
and use VSP HDMI_VIC to indicate the mode.

[How]
Use functions defined in drm to set up the VIC correspondingly.

Signed-off-by: Wayne Lin <Wayne.Lin@amd.com>
Reviewed-by: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index e7786d3..650a6c0 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -3396,6 +3396,8 @@ static void fill_stream_properties_from_drm_display_mode(
        struct dc_crtc_timing *timing_out = &stream->timing;
        const struct drm_display_info *info = &connector->display_info;
        struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
+       struct hdmi_vendor_infoframe hv_frame;
+       struct hdmi_avi_infoframe avi_frame;
        memset(timing_out, 0, sizeof(struct dc_crtc_timing));
 
        timing_out->h_border_left = 0;
@@ -3433,6 +3435,13 @@ static void fill_stream_properties_from_drm_display_mode(
                        timing_out->flags.VSYNC_POSITIVE_POLARITY = 1;
        }
 
+       if (stream->signal == SIGNAL_TYPE_HDMI_TYPE_A) {
+               drm_hdmi_avi_infoframe_from_display_mode(&avi_frame, (struct drm_connector *)connector, mode_in);
+               timing_out->vic = avi_frame.video_code;
+               drm_hdmi_vendor_infoframe_from_display_mode(&hv_frame, (struct drm_connector *)connector, mode_in);
+               timing_out->hdmi_vic = hv_frame.vic;
+       }
+
        timing_out->h_addressable = mode_in->crtc_hdisplay;
        timing_out->h_total = mode_in->crtc_htotal;
        timing_out->h_sync_width =