[Intel-gfx] [PATCH 04/25] drm/edid: start propagating drm_edid to lower levels

[Jani Nikula]

We'll need to propagate drm_edid everywhere. This is a clunky start, but
a start nonetheless. We'll eventually convert all of the EDID parsing to
struct drm_edid.

Initially, we'll just create the struct drm_edid in stack. This will be
the compat layer for legacy struct edid code. In the future, we'll have
EDID read return drm_edid objects.

Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
 drivers/gpu/drm/drm_edid.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 480fd9fbe412..946296632b2e 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -5814,17 +5814,20 @@ static int add_displayid_detailed_modes(struct 
drm_connector *connector,
 }
 
 static int drm_edid_connector_update(struct drm_connector *connector,
-                                    const struct edid *edid)
+                                    const struct drm_edid *drm_edid)
 {
+       const struct edid *edid;
        int num_modes = 0;
        u32 quirks;
 
-       if (edid == NULL) {
+       if (drm_edid == NULL) {
                drm_reset_display_info(connector);
                clear_eld(connector);
                return 0;
        }
 
+       edid = drm_edid->edid;
+
        /*
         * CEA-861-F adds ycbcr capability map block, for HDMI 2.0 sinks.
         * To avoid multiple parsing of same block, lets parse that map
@@ -5890,13 +5893,20 @@ static int drm_edid_connector_update(struct 
drm_connector *connector,
  */
 int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
 {
+       struct drm_edid drm_edid = {};
+
        if (edid && !drm_edid_is_valid(edid)) {
                drm_warn(connector->dev, "%s: EDID invalid.\n",
                         connector->name);
                edid = NULL;
        }
 
-       return drm_edid_connector_update(connector, edid);
+       if (edid) {
+               drm_edid.edid = edid;
+               drm_edid.size = edid_size(edid);
+       }
+
+       return drm_edid_connector_update(connector, edid ? &drm_edid : NULL);
 }
 EXPORT_SYMBOL(drm_add_edid_modes);
 
-- 
2.30.2