drm/edid: Extract drm_mode_cea_vic()

Extract the logic to compute the final CEA VIC to a small helper.
We'll reorder it a bit to make future modifications more
straightforward. No function changes.

Cc: Wayne Lin <waynelin@amd.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004141914.20600-2-ville.syrjala@linux.intel.com
Reviewed-by: Uma Shankar <uma.shankar@intel.com>

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 75aaabc..68f2c88 100644 (file)
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -5161,6 +5161,35 @@ drm_hdmi_infoframe_set_hdr_metadata(struct hdmi_drm_infoframe *frame,
 }
 EXPORT_SYMBOL(drm_hdmi_infoframe_set_hdr_metadata);
 
+static u8 drm_mode_cea_vic(struct drm_connector *connector,
+                          const struct drm_display_mode *mode)
+{
+       u8 vendor_if_vic = drm_match_hdmi_mode(mode);
+       bool is_s3d = mode->flags & DRM_MODE_FLAG_3D_MASK;
+       u8 vic;
+
+       /*
+        * HDMI spec says if a mode is found in HDMI 1.4b 4K modes
+        * we should send its VIC in vendor infoframes, else send the
+        * VIC in AVI infoframes. Lets check if this mode is present in
+        * HDMI 1.4b 4K modes
+        */
+       if (drm_valid_hdmi_vic(vendor_if_vic) && !is_s3d)
+               return 0;
+
+       vic = drm_match_cea_mode(mode);
+
+       /*
+        * HDMI 1.4 VIC range: 1 <= VIC <= 64 (CEA-861-D) but
+        * HDMI 2.0 VIC range: 1 <= VIC <= 107 (CEA-861-F). So we
+        * have to make sure we dont break HDMI 1.4 sinks.
+        */
+       if (!is_hdmi2_sink(connector) && vic > 64)
+               return 0;
+
+       return vic;
+}
+
 /**
  * drm_hdmi_avi_infoframe_from_display_mode() - fill an HDMI AVI infoframe with
  *                                              data from a DRM display mode
@@ -5188,29 +5217,7 @@ drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,
        if (mode->flags & DRM_MODE_FLAG_DBLCLK)
                frame->pixel_repeat = 1;
 
-       frame->video_code = drm_match_cea_mode(mode);
-
-       /*
-        * HDMI 1.4 VIC range: 1 <= VIC <= 64 (CEA-861-D) but
-        * HDMI 2.0 VIC range: 1 <= VIC <= 107 (CEA-861-F). So we
-        * have to make sure we dont break HDMI 1.4 sinks.
-        */
-       if (!is_hdmi2_sink(connector) && frame->video_code > 64)
-               frame->video_code = 0;
-
-       /*
-        * HDMI spec says if a mode is found in HDMI 1.4b 4K modes
-        * we should send its VIC in vendor infoframes, else send the
-        * VIC in AVI infoframes. Lets check if this mode is present in
-        * HDMI 1.4b 4K modes
-        */
-       if (frame->video_code) {
-               u8 vendor_if_vic = drm_match_hdmi_mode(mode);
-               bool is_s3d = mode->flags & DRM_MODE_FLAG_3D_MASK;
-
-               if (drm_valid_hdmi_vic(vendor_if_vic) && !is_s3d)
-                       frame->video_code = 0;
-       }
+       frame->video_code = drm_mode_cea_vic(connector, mode);
 
        frame->picture_aspect = HDMI_PICTURE_ASPECT_NONE;