drm/panel: simple: switch to struct drm_edid

Prefer struct drm_edid based functions over struct edid.

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/869e91527e8f9da054d776ed6109c7a6bc6151cb.1713273659.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
index 50c855476d788eaf1fd57bc12afc4c1440efca54..dcb6d0b6ced06986077579cdc378684499e9ce91 100644 (file)
--- a/drivers/gpu/drm/panel/panel-simple.c
+++ b/drivers/gpu/drm/panel/panel-simple.c
@@ -151,7 +151,7 @@ struct panel_simple {
 
        struct gpio_desc *enable_gpio;
 
-       struct edid *edid;
+       const struct drm_edid *drm_edid;
 
        struct drm_display_mode override_mode;
 
@@ -309,8 +309,8 @@ static int panel_simple_suspend(struct device *dev)
        regulator_disable(p->supply);
        p->unprepared_time = ktime_get_boottime();
 
-       kfree(p->edid);
-       p->edid = NULL;
+       drm_edid_free(p->drm_edid);
+       p->drm_edid = NULL;
 
        return 0;
 }
@@ -399,11 +399,12 @@ static int panel_simple_get_modes(struct drm_panel *panel,
        if (p->ddc) {
                pm_runtime_get_sync(panel->dev);
 
-               if (!p->edid)
-                       p->edid = drm_get_edid(connector, p->ddc);
+               if (!p->drm_edid)
+                       p->drm_edid = drm_edid_read_ddc(connector, p->ddc);
 
-               if (p->edid)
-                       num += drm_add_edid_modes(connector, p->edid);
+               drm_edid_connector_update(connector, p->drm_edid);
+
+               num += drm_edid_connector_add_modes(connector);
 
                pm_runtime_mark_last_busy(panel->dev);
                pm_runtime_put_autosuspend(panel->dev);