[TRYBOT 03/10] drm/edid: merge ELD handling to update_display_info()
Jani Nikula
jani.nikula at intel.com
Thu Dec 15 19:39:03 UTC 2022
Simplify display info update by merging ELD handling as well as clearing
of the data in update_display_info().
Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
drivers/gpu/drm/drm_edid.c | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index d3ce559e0dfa..76b610d40d84 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -5529,8 +5529,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;
@@ -6380,6 +6378,10 @@ static void update_display_info(struct drm_connector *connector,
const struct edid *edid = drm_edid->edid;
drm_reset_display_info(connector);
+ clear_eld(connector);
+
+ if (!drm_edid)
+ return;
info->quirks = edid_get_quirks(drm_edid);
@@ -6462,6 +6464,9 @@ static void update_display_info(struct drm_connector *connector,
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,
@@ -6562,12 +6567,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
@@ -6575,8 +6574,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:
@@ -6713,10 +6712,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);
--
2.34.1
More information about the Intel-gfx-trybot
mailing list