2cb8f5a34e6d203d21ea6a3441de8d1fb8d240f8cb810ca24b6bf060.patch

From 3ebdfa1a5854d2c420f2c2dbeef48ef4b3c69d15 Mon Sep 17 00:00:00 2001
From: Allen-kh Cheng <allen-kh.cheng@mediatek.corp-partner.google.com>
Date: Tue, 31 May 2022 15:41:44 +0800
Subject: [PATCH] revert "CHROMIUM: soc: mediatek: mmsys: instantiate mdp
 virtual device from mmsys"

This reverts commit fe92bc2bd3cd45f8bec1e0026bebc9f17a8eef2f.

BUG=b:204222699
TEST=emerge-corsola sys-kernel/chromeos-kernel-5_15

Signed-off-by: Allen-kh Cheng <allen-kh.cheng@mediatek.corp-partner.google.com>
Change-Id: Iafa53f06911542dea13d71c80ecd8513817e9476
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3678661
Reviewed-by: Hsin-Yi Wang <hsinyi@chromium.org>
Commit-Queue: Hsin-Yi Wang <hsinyi@chromium.org>
---
 drivers/soc/mediatek/mtk-mmsys.c | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c
index 87582fe864275ab1508626b6ddf20c472fe4ee73..d2c7a87aab87e1dd7d53f69aab51231b88933fd2 100644
--- a/drivers/soc/mediatek/mtk-mmsys.c
+++ b/drivers/soc/mediatek/mtk-mmsys.c
@@ -307,7 +307,6 @@ static int mtk_mmsys_probe(struct platform_device *pdev)
 	const struct mtk_mmsys_match_data *match_data;
 	struct mtk_mmsys *mmsys;
 	struct resource *res;
-	struct platform_device *mdp;
 	int ret;
 
 	mmsys = devm_kzalloc(dev, sizeof(*mmsys), GFP_KERNEL);
@@ -365,27 +364,10 @@ static int mtk_mmsys_probe(struct platform_device *pdev)
 					    PLATFORM_DEVID_AUTO, NULL, 0);
 	if (IS_ERR(drm)) {
 		platform_device_unregister(clks);
-		ret = PTR_ERR(drm);
-		goto err_drm;
-	}
-
-	mdp = platform_device_register_data(&pdev->dev, "mtk-mdp",
-					    PLATFORM_DEVID_AUTO, NULL, 0);
-	if (IS_ERR(mdp)) {
-		ret = PTR_ERR(mdp);
-		dev_err(dev, "Failed to register mdp: %d\n", ret);
-		goto err_mdp;
+		return PTR_ERR(drm);
 	}
 
 	return 0;
-
-err_mdp:
-	platform_device_unregister(drm);
-
-err_drm:
-	platform_device_unregister(clks);
-
-	return ret;
 }
 
 static const struct of_device_id of_match_mtk_mmsys[] = {
-- 
2.38.1.584.g0f3c55d4c2-goog