]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
drm/panel: innolux-p079zca: Don't call unprepare+disable at shutdown/remove
authorDouglas Anderson <dianders@chromium.org>
Fri, 3 May 2024 21:32:50 +0000 (14:32 -0700)
committerDouglas Anderson <dianders@chromium.org>
Tue, 28 May 2024 20:09:10 +0000 (13:09 -0700)
It's the responsibility of a correctly written DRM modeset driver to
call drm_atomic_helper_shutdown() at shutdown time and that should be
disabling / unpreparing the panel if needed. Panel drivers shouldn't
be calling these functions themselves.

A recent effort was made to fix as many DRM modeset drivers as
possible [1] [2] [3] and most drivers are fixed now.

A grep through mainline for compatible strings used by this driver
indicates that it is used by Rockchip boards. The Rockchip driver
appears to be correctly calling drm_atomic_helper_shutdown() so we can
remove the calls.

[1] https://lore.kernel.org/r/20230901234015.566018-1-dianders@chromium.org
[2] https://lore.kernel.org/r/20230901234202.566951-1-dianders@chromium.org
[3] https://lore.kernel.org/r/20230921192749.1542462-1-dianders@chromium.org

Cc: Chris Zhong <zyw@rock-chips.com>
Cc: Lin Huang <hl@rock-chips.com>
Cc: Brian Norris <briannorris@chromium.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Maxime Ripard <mripard@kernel.org>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240503143327.RFT.v2.9.Iaddb8e0cab570e2f8066a4baf1d49239a820b799@changeid
drivers/gpu/drm/panel/panel-innolux-p079zca.c

index fe83e5e218df702e26238fb2eac84a94a1f505d6..d95c0d4f3e3534d70901864fa9ed0fff8f37d236 100644 (file)
@@ -460,13 +460,6 @@ static void innolux_panel_remove(struct mipi_dsi_device *dsi)
        struct innolux_panel *innolux = mipi_dsi_get_drvdata(dsi);
        int err;
 
-       err = drm_panel_unprepare(&innolux->base);
-       if (err < 0)
-               dev_err(&dsi->dev, "failed to unprepare panel: %d\n", err);
-
-       err = drm_panel_disable(&innolux->base);
-       if (err < 0)
-               dev_err(&dsi->dev, "failed to disable panel: %d\n", err);
 
        err = mipi_dsi_detach(dsi);
        if (err < 0)
@@ -475,14 +468,6 @@ static void innolux_panel_remove(struct mipi_dsi_device *dsi)
        innolux_panel_del(innolux);
 }
 
-static void innolux_panel_shutdown(struct mipi_dsi_device *dsi)
-{
-       struct innolux_panel *innolux = mipi_dsi_get_drvdata(dsi);
-
-       drm_panel_unprepare(&innolux->base);
-       drm_panel_disable(&innolux->base);
-}
-
 static struct mipi_dsi_driver innolux_panel_driver = {
        .driver = {
                .name = "panel-innolux-p079zca",
@@ -490,7 +475,6 @@ static struct mipi_dsi_driver innolux_panel_driver = {
        },
        .probe = innolux_panel_probe,
        .remove = innolux_panel_remove,
-       .shutdown = innolux_panel_shutdown,
 };
 module_mipi_dsi_driver(innolux_panel_driver);