Skip to content

Commit c38896c

Browse files
diandersmripard
authored andcommitted
drm/mediatek: Call drm_atomic_helper_shutdown() at shutdown time
Based on grepping through the source code this driver appears to be missing a call to drm_atomic_helper_shutdown() at system shutdown time. Among other things, this means that if a panel is in use that it won't be cleanly powered off at system shutdown time. The fact that we should call drm_atomic_helper_shutdown() in the case of OS shutdown/restart comes straight out of the kernel doc "driver instance overview" in drm_drv.c. This driver users the component model and shutdown happens in the base driver. The "drvdata" for this driver will always be valid if shutdown() is called and as of commit 2a07396 ("drm/atomic-helper: drm_atomic_helper_shutdown(NULL) should be a noop") we don't need to confirm that "drm" is non-NULL. Suggested-by: Maxime Ripard <mripard@kernel.org> Reviewed-by: Maxime Ripard <mripard@kernel.org> Reviewed-by: Fei Shao <fshao@chromium.org> Tested-by: Fei Shao <fshao@chromium.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> Signed-off-by: Maxime Ripard <mripard@kernel.org> Link: https://patchwork.freedesktop.org/patch/msgid/20240611102744.v2.1.I2b014f90afc4729b6ecc7b5ddd1f6dedcea4625b@changeid
1 parent 0320ca1 commit c38896c

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

drivers/gpu/drm/mediatek/mtk_drm_drv.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -952,6 +952,13 @@ static void mtk_drm_remove(struct platform_device *pdev)
952952
of_node_put(private->comp_node[i]);
953953
}
954954

955+
static void mtk_drm_shutdown(struct platform_device *pdev)
956+
{
957+
struct mtk_drm_private *private = platform_get_drvdata(pdev);
958+
959+
drm_atomic_helper_shutdown(private->drm);
960+
}
961+
955962
static int mtk_drm_sys_prepare(struct device *dev)
956963
{
957964
struct mtk_drm_private *private = dev_get_drvdata(dev);
@@ -983,6 +990,7 @@ static const struct dev_pm_ops mtk_drm_pm_ops = {
983990
static struct platform_driver mtk_drm_platform_driver = {
984991
.probe = mtk_drm_probe,
985992
.remove_new = mtk_drm_remove,
993+
.shutdown = mtk_drm_shutdown,
986994
.driver = {
987995
.name = "mediatek-drm",
988996
.pm = &mtk_drm_pm_ops,

0 commit comments

Comments
 (0)