9ed795207b07a616b6dfa292aa04d4b64e5a366e36a2bca2084d3151.patch

From 1eea926bcf6829a03e1e4a8e5c04c5abf7366f18 Mon Sep 17 00:00:00 2001
From: Adrian Ratiu <adrian.ratiu@collabora.corp-partner.google.com>
Date: Thu, 9 Dec 2021 17:59:54 +0200
Subject: [PATCH] CHROMIUM: drm/panfrost: nerf driver by changing compat string

For various reasons, some of which were discussed in [1], we
want both the vendor and panfrost Mali drivers be enabled in
the CrOS kernel trees.

Currently the vendor probe() succeeds and panfrost fails due
to "CHROMIUM: arm64: dts: mt8183: Add gpu node and opp lists"
but relying on these DT differences to determine the driver
is a bit risky, so we deliberately nerf panfrost.

Those who wish to experiment with panfrost on specific boards
will have to explicitly change the compat. When / if ChromeOS
is ready for panfrost by default this should be reverted and
the vendor-specific bits deleted.

[1] https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3311282

BUG=b:205549284
TEST=Local builds & boot on jacuzzi (MT8183); CQ.

Change-Id: I2b1af1dd15467376eb3d8af77f5dc95ad172affa
Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.corp-partner.google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3327029
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Fei Shao <fshao@chromium.org>
Commit-Queue: Fei Shao <fshao@chromium.org>
Tested-by: Fei Shao <fshao@chromium.org>
---
 drivers/gpu/drm/panfrost/panfrost_drv.c | 26 ++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c
index 2fa5afe21288929e2a479c4f61f94a441a253cee..610a7f429efe11cbd9985f3ea79262671c6d3a2f 100644
--- a/drivers/gpu/drm/panfrost/panfrost_drv.c
+++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
@@ -656,22 +656,22 @@ static const struct panfrost_compatible mediatek_mt8183_data = {
 
 static const struct of_device_id dt_match[] = {
 	/* Set first to probe before the generic compatibles */
-	{ .compatible = "amlogic,meson-gxm-mali",
+	{ .compatible = "amlogic,meson-gxm-mali-CHROMIUM",
 	  .data = &amlogic_data, },
-	{ .compatible = "amlogic,meson-g12a-mali",
+	{ .compatible = "amlogic,meson-g12a-mali-CHROMIUM",
 	  .data = &amlogic_data, },
-	{ .compatible = "arm,mali-t604", .data = &default_data, },
-	{ .compatible = "arm,mali-t624", .data = &default_data, },
-	{ .compatible = "arm,mali-t628", .data = &default_data, },
-	{ .compatible = "arm,mali-t720", .data = &default_data, },
-	{ .compatible = "arm,mali-t760", .data = &default_data, },
-	{ .compatible = "arm,mali-t820", .data = &default_data, },
-	{ .compatible = "arm,mali-t830", .data = &default_data, },
-	{ .compatible = "arm,mali-t860", .data = &default_data, },
-	{ .compatible = "arm,mali-t880", .data = &default_data, },
-	{ .compatible = "arm,mali-bifrost", .data = &default_data, },
+	{ .compatible = "arm,mali-t604-CHROMIUM", .data = &default_data, },
+	{ .compatible = "arm,mali-t624-CHROMIUM", .data = &default_data, },
+	{ .compatible = "arm,mali-t628-CHROMIUM", .data = &default_data, },
+	{ .compatible = "arm,mali-t720-CHROMIUM", .data = &default_data, },
+	{ .compatible = "arm,mali-t760-CHROMIUM", .data = &default_data, },
+	{ .compatible = "arm,mali-t820-CHROMIUM", .data = &default_data, },
+	{ .compatible = "arm,mali-t830-CHROMIUM", .data = &default_data, },
+	{ .compatible = "arm,mali-t860-CHROMIUM", .data = &default_data, },
+	{ .compatible = "arm,mali-t880-CHROMIUM", .data = &default_data, },
+	{ .compatible = "arm,mali-bifrost-CHROMIUM", .data = &default_data, },
 	{ .compatible = "arm,mali-valhall-jm", .data = &default_data, },
-	{ .compatible = "mediatek,mt8183-mali", .data = &mediatek_mt8183_data },
+	{ .compatible = "mediatek,mt8183-mali-CHROMIUM", .data = &mediatek_mt8183_data },
 	{}
 };
 MODULE_DEVICE_TABLE(of, dt_match);
-- 
2.38.1.584.g0f3c55d4c2-goog