mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-08 12:52:40 -04:00
drm/panel: edp: Stop tracking prepared/enabled
As talked about in commit d2aacaf073 ("drm/panel: Check for already
prepared/enabled in drm_panel"), we want to remove needless code from
panel drivers that was storing and double-checking the
prepared/enabled state. Even if someone was relying on the
double-check before, that double-check is now in the core and not
needed in individual drivers.
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240503143327.RFT.v2.6.I4d1bf08781593c08127e506422687ab19fd3c824@changeid
This commit is contained in:
@@ -222,11 +222,8 @@ struct edp_panel_entry {
|
||||
|
||||
struct panel_edp {
|
||||
struct drm_panel base;
|
||||
bool enabled;
|
||||
bool no_hpd;
|
||||
|
||||
bool prepared;
|
||||
|
||||
ktime_t prepared_time;
|
||||
ktime_t powered_on_time;
|
||||
ktime_t unprepared_time;
|
||||
@@ -395,14 +392,9 @@ static int panel_edp_disable(struct drm_panel *panel)
|
||||
{
|
||||
struct panel_edp *p = to_panel_edp(panel);
|
||||
|
||||
if (!p->enabled)
|
||||
return 0;
|
||||
|
||||
if (p->desc->delay.disable)
|
||||
msleep(p->desc->delay.disable);
|
||||
|
||||
p->enabled = false;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -420,17 +412,11 @@ static int panel_edp_suspend(struct device *dev)
|
||||
|
||||
static int panel_edp_unprepare(struct drm_panel *panel)
|
||||
{
|
||||
struct panel_edp *p = to_panel_edp(panel);
|
||||
int ret;
|
||||
|
||||
/* Unpreparing when already unprepared is a no-op */
|
||||
if (!p->prepared)
|
||||
return 0;
|
||||
|
||||
ret = pm_runtime_put_sync_suspend(panel->dev);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
p->prepared = false;
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -542,21 +528,14 @@ static int panel_edp_resume(struct device *dev)
|
||||
|
||||
static int panel_edp_prepare(struct drm_panel *panel)
|
||||
{
|
||||
struct panel_edp *p = to_panel_edp(panel);
|
||||
int ret;
|
||||
|
||||
/* Preparing when already prepared is a no-op */
|
||||
if (p->prepared)
|
||||
return 0;
|
||||
|
||||
ret = pm_runtime_get_sync(panel->dev);
|
||||
if (ret < 0) {
|
||||
pm_runtime_put_autosuspend(panel->dev);
|
||||
return ret;
|
||||
}
|
||||
|
||||
p->prepared = true;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -565,9 +544,6 @@ static int panel_edp_enable(struct drm_panel *panel)
|
||||
struct panel_edp *p = to_panel_edp(panel);
|
||||
unsigned int delay;
|
||||
|
||||
if (p->enabled)
|
||||
return 0;
|
||||
|
||||
delay = p->desc->delay.enable;
|
||||
|
||||
/*
|
||||
@@ -598,8 +574,6 @@ static int panel_edp_enable(struct drm_panel *panel)
|
||||
|
||||
panel_edp_wait(p->powered_on_time, p->desc->delay.powered_on_to_enable);
|
||||
|
||||
p->enabled = true;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -869,7 +843,6 @@ static int panel_edp_probe(struct device *dev, const struct panel_desc *desc,
|
||||
if (!panel)
|
||||
return -ENOMEM;
|
||||
|
||||
panel->enabled = false;
|
||||
panel->prepared_time = 0;
|
||||
panel->desc = desc;
|
||||
panel->aux = aux;
|
||||
|
||||
Reference in New Issue
Block a user