[RFT,v2,09/48] drm/panel: innolux-p079zca: Don't call unprepare+disable at shutdown/remove

Commit Message

Doug Anderson May 3, 2024, 9:32 p.m. UTC

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/[e-mail]
[2] https://lore.kernel.org/r/[e-mail]
[3] https://lore.kernel.org/r/[e-mail]

Cc: Chris Zhong <[e-mail]>
Cc: Lin Huang <[e-mail]>
Cc: Brian Norris <[e-mail]>
Cc: "Heiko Stübner" <[e-mail]>
Signed-off-by: Douglas Anderson <[e-mail]>
---

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(-)

Comments

Heiko Stuebner May 6, 2024, 4:29 p.m. UTC | #1

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/[e-mail]
> [2] https://lore.kernel.org/r/[e-mail]
> [3] https://lore.kernel.org/r/[e-mail]
> 
> Cc: Chris Zhong <[e-mail]>
> Cc: Lin Huang <[e-mail]>
> Cc: Brian Norris <[e-mail]>
> Cc: "Heiko Stübner" <[e-mail]>
> Signed-off-by: Douglas Anderson <[e-mail]>

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 <[e-mail]>

Patch

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);