drm/edid: merge ELD handling to update_display_info()

Simplify display info update by merging ELD handling as well as clearing
of the data in update_display_info().

The connector->eld really should be moved under display_info altogether,
but that's for another time.

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

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index ffc5a2f..f58b0fd 100644 (file)
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -5485,8 +5485,6 @@ static void drm_edid_to_eld(struct drm_connector *connector,
        int total_sad_count = 0;
        int mnl;
 
-       clear_eld(connector);
-
        if (!drm_edid)
                return;
 
@@ -6432,9 +6430,15 @@ static void update_display_info(struct drm_connector *connector,
                                const struct drm_edid *drm_edid)
 {
        struct drm_display_info *info = &connector->display_info;
-       const struct edid *edid = drm_edid->edid;
+       const struct edid *edid;
 
        drm_reset_display_info(connector);
+       clear_eld(connector);
+
+       if (!drm_edid)
+               return;
+
+       edid = drm_edid->edid;
 
        info->quirks = edid_get_quirks(drm_edid);
 
@@ -6517,6 +6521,9 @@ out:
 
        if (info->quirks & EDID_QUIRK_CAP_DSC_15BPP)
                info->max_dsc_bpp = 15;
+
+       /* Depends on info->cea_rev set by drm_parse_cea_ext() above */
+       drm_edid_to_eld(connector, drm_edid);
 }
 
 static struct drm_display_mode *drm_mode_displayid_detailed(struct drm_device *dev,
@@ -6617,12 +6624,6 @@ static int _drm_edid_connector_update(struct drm_connector *connector,
        struct drm_display_info *info = &connector->display_info;
        int num_modes = 0;
 
-       if (!drm_edid) {
-               drm_reset_display_info(connector);
-               clear_eld(connector);
-               return 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
@@ -6630,8 +6631,8 @@ static int _drm_edid_connector_update(struct drm_connector *connector,
         */
        update_display_info(connector, drm_edid);
 
-       /* Depends on info->cea_rev set by update_display_info() above */
-       drm_edid_to_eld(connector, drm_edid);
+       if (!drm_edid)
+               return 0;
 
        /*
         * EDID spec says modes should be preferred in this order:
@@ -6768,10 +6769,7 @@ static int _drm_connector_update_edid_property(struct drm_connector *connector,
         * that it seems better to duplicate it rather than attempt to ensure
         * some arbitrary ordering of calls.
         */
-       if (drm_edid)
-               update_display_info(connector, drm_edid);
-       else
-               drm_reset_display_info(connector);
+       update_display_info(connector, drm_edid);
 
        _drm_update_tile_info(connector, drm_edid);