aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/panel/panel-simple.c
diff options
context:
space:
mode:
authorDouglas Anderson <dianders@chromium.org>2021-04-23 09:58:47 -0700
committerDouglas Anderson <dianders@chromium.org>2021-04-30 13:24:30 -0700
commit70e12560126685e982ee680e0e40049edbd66cf0 (patch)
tree16f0be9cbd3371b7ec9cb86a94ecb23e04f4f8e2 /drivers/gpu/drm/panel/panel-simple.c
parentdrm/bridge: nwl-dsi: Get MIPI DSI controller and PHY ready in ->mode_set() (diff)
downloadlinux-dev-70e12560126685e982ee680e0e40049edbd66cf0.tar.xz
linux-dev-70e12560126685e982ee680e0e40049edbd66cf0.zip
drm/panel: panel-simple: Add missing pm_runtime_disable() calls
In commit 3235b0f20a0a ("drm/panel: panel-simple: Use runtime pm to avoid excessive unprepare / prepare") we started using pm_runtime, but my patch neglected to add the proper pm_runtime_disable(). Doh! Add them now. Fixes: 3235b0f20a0a ("drm/panel: panel-simple: Use runtime pm to avoid excessive unprepare / prepare") Reported-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/20210423095743.v5.1.I9e6af2529d6c61e5daf86a15a1211121c5223b9a@changeid
Diffstat (limited to 'drivers/gpu/drm/panel/panel-simple.c')
-rw-r--r--drivers/gpu/drm/panel/panel-simple.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
index 6b22872b3281..9746eda6f675 100644
--- a/drivers/gpu/drm/panel/panel-simple.c
+++ b/drivers/gpu/drm/panel/panel-simple.c
@@ -797,12 +797,14 @@ static int panel_simple_probe(struct device *dev, const struct panel_desc *desc)
err = drm_panel_of_backlight(&panel->base);
if (err)
- goto free_ddc;
+ goto disable_pm_runtime;
drm_panel_add(&panel->base);
return 0;
+disable_pm_runtime:
+ pm_runtime_disable(dev);
free_ddc:
if (panel->ddc)
put_device(&panel->ddc->dev);
@@ -818,6 +820,7 @@ static int panel_simple_remove(struct device *dev)
drm_panel_disable(&panel->base);
drm_panel_unprepare(&panel->base);
+ pm_runtime_disable(dev);
if (panel->ddc)
put_device(&panel->ddc->dev);