Adjust broken patch that fixes reboot troubles on meson64 family

This commit is contained in:
Igor Pecovnik 2021-06-15 21:02:18 +02:00
parent 8cc20a2c6b
commit f34f322eef

View File

@ -1,40 +1,18 @@
From 66e11351f4210f927a513662ab9369ef3ebad52a Mon Sep 17 00:00:00 2001
From: Dongjin Kim <tobetter@gmail.com>
Date: Wed, 14 Apr 2021 18:00:07 +0900
Subject: [PATCH] ODROID-N2/C4/HC4: Revert "drm: meson_drv add shutdown
function"
From 22ce3ced8b11ceb313dea2aab1bb8ac028320dbb Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Tue, 15 Jun 2021 19:53:41 +0200
Subject: [PATCH] Remove shutdown
Reboot fails 100% with this commit.
This reverts commit b0fe7f2c002adecda5f146bc5e430d0e3965c255.
Change-Id: Id91b44dad4359f137dfea2738e3a7705b211e67a
Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
---
drivers/gpu/drm/meson/meson_drv.c | 11 -----------
1 file changed, 11 deletions(-)
drivers/gpu/drm/meson/meson_drv.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
index 453d8b4c5763d9..42c5d3246cfcbd 100644
index 2753067c0..b591aee04 100644
--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c
@@ -482,16 +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);
- struct drm_device *drm = priv->drm;
-
- DRM_DEBUG_DRIVER("\n");
- drm_kms_helper_poll_fini(drm);
- drm_atomic_helper_shutdown(drm);
-}
-
static int meson_drv_probe(struct platform_device *pdev)
{
struct component_match *match = NULL;
@@ -563,7 +553,6 @@ static const struct dev_pm_ops meson_drv_pm_ops = {
@@ -564,7 +564,6 @@ static const struct dev_pm_ops meson_drv_pm_ops = {
static struct platform_driver meson_drm_platform_driver = {
.probe = meson_drv_probe,
@ -42,3 +20,6 @@ index 453d8b4c5763d9..42c5d3246cfcbd 100644
.driver = {
.name = "meson-drm",
.of_match_table = dt_match,
--
Created with Armbian build tools https://github.com/armbian/build