drm/edid: refactor _drm_edid_connector_update() and rename

By moving update_display_info() out of _drm_edid_connector_update() we
make the function purely about adding modes. Rename accordingly.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e9880bbb2b5724d9aac88a90a31ba3ba9af9da3f.1674144945.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index ee453e39562a60fa56e330b4915ca03e5d69efc4..f9502df3dbca8590eb956ce53029029befe44d06 100644 (file)
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -6637,19 +6637,12 @@ static int add_displayid_detailed_modes(struct drm_connector *connector,
        return num_modes;
 }
 
-static int _drm_edid_connector_update(struct drm_connector *connector,
-                                     const struct drm_edid *drm_edid)
+static int _drm_edid_connector_add_modes(struct drm_connector *connector,
+                                        const struct drm_edid *drm_edid)
 {
        const struct drm_display_info *info = &connector->display_info;
        int num_modes = 0;
 
-       /*
-        * CEA-861-F adds ycbcr capability map block, for HDMI 2.0 sinks.
-        * To avoid multiple parsing of same block, lets parse that map
-        * from sink info, before parsing CEA modes.
-        */
-       update_display_info(connector, drm_edid);
-
        if (!drm_edid)
                return 0;
 
@@ -6754,7 +6747,9 @@ int drm_edid_connector_update(struct drm_connector *connector,
 {
        int count;
 
-       count = _drm_edid_connector_update(connector, drm_edid);
+       update_display_info(connector, drm_edid);
+
+       count = _drm_edid_connector_add_modes(connector, drm_edid);
 
        _drm_update_tile_info(connector, drm_edid);
 
@@ -6824,7 +6819,8 @@ EXPORT_SYMBOL(drm_connector_update_edid_property);
  */
 int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
 {
-       struct drm_edid drm_edid;
+       struct drm_edid _drm_edid;
+       const struct drm_edid *drm_edid;
 
        if (edid && !drm_edid_is_valid(edid)) {
                drm_warn(connector->dev, "[CONNECTOR:%d:%s] EDID invalid.\n",
@@ -6832,8 +6828,11 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
                edid = NULL;
        }
 
-       return _drm_edid_connector_update(connector,
-                                         drm_edid_legacy_init(&drm_edid, edid));
+       drm_edid = drm_edid_legacy_init(&_drm_edid, edid);
+
+       update_display_info(connector, drm_edid);
+
+       return _drm_edid_connector_add_modes(connector, drm_edid);
 }
 EXPORT_SYMBOL(drm_add_edid_modes);