From 714b968f3e90b39049302332ae6f0f427b8cc421 Mon Sep 17 00:00:00 2001
From: omame <me@omame.xyz>
Date: Sat, 5 Mar 2022 02:08:19 +0100
Subject: [PATCH] samsung-j6primelte: disable MSM KGSL (MR 2978)

CONFIG_MSM_KGSL (Kernel Graphics Subsystem Layer) breaks the framebuffer
in mysterious ways even on this device. This MR disables KGSL to restore
framebuffer functionality.
---
 device/testing/linux-samsung-j6primelte/APKBUILD           | 4 ++--
 .../config-samsung-j6primelte.armv7                        | 7 +------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/device/testing/linux-samsung-j6primelte/APKBUILD b/device/testing/linux-samsung-j6primelte/APKBUILD
index 17d92d13d..bb4c6a645 100644
--- a/device/testing/linux-samsung-j6primelte/APKBUILD
+++ b/device/testing/linux-samsung-j6primelte/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: omame <me@omame.xyz>
 pkgname=linux-samsung-j6primelte
 pkgver=3.18.124
-pkgrel=2
+pkgrel=3
 pkgdesc="Samsung Galaxy J6+ kernel (LineageOS 18.1)"
 arch="armv7"
 _carch="arm"
@@ -53,7 +53,7 @@ package() {
 
 sha512sums="
 c321711852dfdbc1b36cb507c57e11fb72d3bef2f62d99b1ee84939eaf6b34bb8821a85afaaf0a2477af39d6128f889f15d8fd06f98030d98ed123eb15a627d5  linux-samsung-j6primelte-f7e2c1efe869135a768cb5dfcdf452adecb6e0f3.tar.gz
-53e1b743a655a164085fd54d27c95ddc1cc5de992bc6f34ce4773469abcc770ba058a03d627dabd6c8bee048f383322bc1edfef9b3f572e62c59c0812e737fd2  config-samsung-j6primelte.armv7
+8dcda81717d0464041dcb6c8d3786b1577ddd848e36bb0eccc17545b2a5d60e5dc42e3ece77d66aa9c51790417f1b7148273f919d490cfa4ed6b270df8aed5f6  config-samsung-j6primelte.armv7
 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
 1be8126e7a3e38827536eb5dc22fce6a713322a1e564abaac571a240844f13d8fde7f9e5d0b4c803c2a2f9fef9d2d35b3a57448a944270cc8f105112ee65acb9  samsung_defex_lsm_use_relative_path.patch
 "
diff --git a/device/testing/linux-samsung-j6primelte/config-samsung-j6primelte.armv7 b/device/testing/linux-samsung-j6primelte/config-samsung-j6primelte.armv7
index 44b90a945..b39b1a0af 100644
--- a/device/testing/linux-samsung-j6primelte/config-samsung-j6primelte.armv7
+++ b/device/testing/linux-samsung-j6primelte/config-samsung-j6primelte.armv7
@@ -2750,10 +2750,7 @@ CONFIG_MEDIA_TUNER_MC44S803=y
 #
 # Graphics support
 #
-CONFIG_MSM_KGSL=y
-# CONFIG_MSM_KGSL_CFF_DUMP is not set
-CONFIG_MSM_ADRENO_DEFAULT_GOVERNOR="msm-adreno-tz"
-CONFIG_MSM_KGSL_IOMMU=y
+# CONFIG_MSM_KGSL is not set
 
 #
 # Direct Rendering Manager
@@ -3966,9 +3963,7 @@ CONFIG_DEVFREQ_GOV_PERFORMANCE=y
 CONFIG_DEVFREQ_GOV_POWERSAVE=y
 CONFIG_DEVFREQ_GOV_USERSPACE=y
 CONFIG_DEVFREQ_GOV_CPUFREQ=y
-CONFIG_DEVFREQ_GOV_MSM_ADRENO_TZ=y
 CONFIG_MSM_BIMC_BWMON=y
-CONFIG_DEVFREQ_GOV_MSM_GPUBW_MON=y
 # CONFIG_ARMBW_HWMON is not set
 # CONFIG_ARM_MEMLAT_MON is not set
 # CONFIG_MSMCCI_HWMON is not set