Message ID | 20240503143327.RFT.v2.9.Iaddb8e0cab570e2f8066a4baf1d49239a820b799@changeid (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/panel: Remove most store/double-check of prepared/enabled state | expand |
Am Freitag, 3. Mai 2024, 23:32:50 CEST schrieb Douglas Anderson: > 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> > Cc: "Heiko Stübner" <heiko@sntech.de> > Signed-off-by: Douglas Anderson <dianders@chromium.org> the underlying setup (rockchip-drm with dw-dsi) as well as the change itself is similar to the ltk050h3146w variant, so I don't see how this should behave differently ;-) Reviewed-by: Heiko Stuebner <heiko@sntech.de>
diff --git a/drivers/gpu/drm/panel/panel-innolux-p079zca.c b/drivers/gpu/drm/panel/panel-innolux-p079zca.c index 5833d3a0fc79..280f0fc35b67 100644 --- a/drivers/gpu/drm/panel/panel-innolux-p079zca.c +++ b/drivers/gpu/drm/panel/panel-innolux-p079zca.c @@ -471,13 +471,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) @@ -486,14 +479,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", @@ -501,7 +486,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);
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> Cc: "Heiko Stübner" <heiko@sntech.de> Signed-off-by: Douglas Anderson <dianders@chromium.org> --- Changes in v2: - Only handle 1 panel per patch. - Split removal of prepared/enabled from handling of remove/shutdown. drivers/gpu/drm/panel/panel-innolux-p079zca.c | 16 ---------------- 1 file changed, 16 deletions(-)