The simple-panel driver is for panels that are not hot-pluggable at runtime. Let's keep our cached EDID around until driver unload.
Signed-off-by: Douglas Anderson dianders@chromium.org ---
Changes in v3: - ("Don't re-read the EDID every time") moved to eDP only patch.
drivers/gpu/drm/panel/panel-simple-edp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/panel/panel-simple-edp.c b/drivers/gpu/drm/panel/panel-simple-edp.c index 5d58dc25ddf5..90ba146426e4 100644 --- a/drivers/gpu/drm/panel/panel-simple-edp.c +++ b/drivers/gpu/drm/panel/panel-simple-edp.c @@ -362,9 +362,6 @@ static int panel_edp_suspend(struct device *dev) regulator_disable(p->supply); p->unprepared_time = ktime_get();
- kfree(p->edid); - p->edid = NULL; - return 0; }
@@ -758,6 +755,9 @@ static int panel_edp_remove(struct device *dev) if (panel->ddc && (!panel->aux || panel->ddc != &panel->aux->ddc)) put_device(&panel->ddc->dev);
+ kfree(panel->edid); + panel->edid = NULL; + return 0; }