10a4710248
To make HDMI CEC work, we have to compile MESON_DRM as a module (see #1717). However, this essentially reverts #1347, which fixed the reboot problem by compiling the driver into the kernel. Hence we need to reintroduce the earlier fix from #1345, which reverts the offending commit causing the reboot problem.
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
From be21685475a0739d44ca4c63fcb7f50b324593c9 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <be21685475a0739d44ca4c63fcb7f50b324593c9.1642331593.git.stefan@agner.ch>
|
|
In-Reply-To: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
|
|
References: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
|
|
From: Stefan Agner <stefan@agner.ch>
|
|
Date: Sun, 16 Jan 2022 12:12:29 +0100
|
|
Subject: [PATCH 10/10] Revert "drm: meson_drv add shutdown function"
|
|
|
|
This reverts commit d4ec1ffbdaa8939a208656e9c1440742c457ef16.
|
|
|
|
It seems that this patch actually breaks reboot on ODROID-N2+.
|
|
---
|
|
drivers/gpu/drm/meson/meson_drv.c | 12 ------------
|
|
1 file changed, 12 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
|
|
index 2753067c08e6..3d1de9cbb1c8 100644
|
|
--- a/drivers/gpu/drm/meson/meson_drv.c
|
|
+++ b/drivers/gpu/drm/meson/meson_drv.c
|
|
@@ -482,17 +482,6 @@ static int meson_probe_remote(struct platform_device *pdev,
|
|
return count;
|
|
}
|
|
|
|
-static void meson_drv_shutdown(struct platform_device *pdev)
|
|
-{
|
|
- struct meson_drm *priv = dev_get_drvdata(&pdev->dev);
|
|
-
|
|
- if (!priv)
|
|
- return;
|
|
-
|
|
- drm_kms_helper_poll_fini(priv->drm);
|
|
- drm_atomic_helper_shutdown(priv->drm);
|
|
-}
|
|
-
|
|
static int meson_drv_probe(struct platform_device *pdev)
|
|
{
|
|
struct component_match *match = NULL;
|
|
@@ -564,7 +553,6 @@ static const struct dev_pm_ops meson_drv_pm_ops = {
|
|
|
|
static struct platform_driver meson_drm_platform_driver = {
|
|
.probe = meson_drv_probe,
|
|
- .shutdown = meson_drv_shutdown,
|
|
.driver = {
|
|
.name = "meson-drm",
|
|
.of_match_table = dt_match,
|
|
--
|
|
2.34.1
|
|
|