From 4c6a1a2bd38feedff3041460a43d30c35b27c773 Mon Sep 17 00:00:00 2001
From: Joel Stein <js@funkturm.net>
Date: Sun, 14 Apr 2019 03:05:58 +0200
Subject: [PATCH 1/2] Fix graphics on eng-build (mediatek weirdness)

(cherry picked from commit 7952b70b71e8f20b55d1fa1e7bf6b0aa3e89372d)
---
 drivers/misc/mediatek/gpu/ged/Makefile                       | 4 ++--
 drivers/misc/mediatek/gpu/mt8173/1.5_ED3830101/Makefile      | 3 ++-
 .../mt8173/1.5_ED3830101/services/server/common/srvcore.c    | 5 +++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/misc/mediatek/gpu/ged/Makefile b/drivers/misc/mediatek/gpu/ged/Makefile
index 0e9cd4d4..e4b9d21f 100755
--- a/drivers/misc/mediatek/gpu/ged/Makefile
+++ b/drivers/misc/mediatek/gpu/ged/Makefile
@@ -4,10 +4,10 @@ MTK_TOP = $(srctree)/drivers/misc/mediatek/
 VER:=eng
 
 ifneq ($(strip $(TARGET_BUILD_VARIANT)),)
-ifneq ($(strip $(TARGET_BUILD_VARIANT)),eng)
+#ifneq ($(strip $(TARGET_BUILD_VARIANT)),eng)
 VER:=user
 ccflags-y += -DGED_LOG_SIZE_LIMITED
-endif
+#endif
 endif
 
 ccflags-y += \
diff --git a/drivers/misc/mediatek/gpu/mt8173/1.5_ED3830101/Makefile b/drivers/misc/mediatek/gpu/mt8173/1.5_ED3830101/Makefile
index 874f0816..78e58d11 100644
--- a/drivers/misc/mediatek/gpu/mt8173/1.5_ED3830101/Makefile
+++ b/drivers/misc/mediatek/gpu/mt8173/1.5_ED3830101/Makefile
@@ -6,7 +6,8 @@ RGX_TOP := $(srctree)/drivers/misc/mediatek/gpu/$(MTK_PLATFORM)/1.5_ED3830101/
 
 ccflags-y += -I$(srctree)/drivers/misc/mediatek/base/power/$(MTK_PLATFORM)
 
-VER := $(if $(filter eng,$(TARGET_BUILD_VARIANT)),eng,user)
+#VER := $(if $(filter eng,$(TARGET_BUILD_VARIANT)),eng,user)
+VER := user
 ccflags-y += -include $(RGX_TOP)/include/config_kernel_$(VER).h
 
 ccflags-y += \
diff --git a/drivers/misc/mediatek/gpu/mt8173/1.5_ED3830101/services/server/common/srvcore.c b/drivers/misc/mediatek/gpu/mt8173/1.5_ED3830101/services/server/common/srvcore.c
index 38f42c71..e2ee8b36 100644
--- a/drivers/misc/mediatek/gpu/mt8173/1.5_ED3830101/services/server/common/srvcore.c
+++ b/drivers/misc/mediatek/gpu/mt8173/1.5_ED3830101/services/server/common/srvcore.c
@@ -178,8 +178,11 @@ PVRSRVConnectKM(CONNECTION_DATA *psConnection,
 				IMG_UINT32 *ui32Log2PageSize)
 {
 	PVRSRV_ERROR		eError = PVRSRV_OK;
+//#define WTF_AMAZON
+#ifndef WTF_AMAZON
 	IMG_UINT32			ui32BuildOptions, ui32BuildOptionsMismatch;
 	IMG_UINT32			ui32DDKVersion, ui32DDKBuild;
+#endif
 	
 	*ui32Log2PageSize = GET_LOG2_PAGESIZE();
 
@@ -214,6 +217,7 @@ PVRSRVConnectKM(CONNECTION_DATA *psConnection,
 		PVRSRVSetInitServerState(PVRSRV_INIT_SERVER_RUNNING, IMG_TRUE);
 #endif
 	}
+#ifndef WTF_AMAZON
 	else
 	{
 		if(PVRSRVGetInitServerState(PVRSRV_INIT_SERVER_RAN))
@@ -346,6 +350,7 @@ PVRSRVConnectKM(CONNECTION_DATA *psConnection,
 	}
 #endif
 
+#endif
 chk_exit:
 	return eError;
 }

From 494400f2d43a5ce3bd02acd9aa24405b96fd5f69 Mon Sep 17 00:00:00 2001
From: Naphatr Bootsobha <naphatr.bootsobha@tutanota.de>
Date: Sun, 15 Nov 2020 19:11:58 +0000
Subject: [PATCH 2/2] add extern keyword for GCC 10

---
 scripts/dtc/dtc-lexer.l             | 2 +-
 scripts/dtc/dtc-lexer.lex.c_shipped | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
index 3b41bfca..9b9c29e6 100644
--- a/scripts/dtc/dtc-lexer.l
+++ b/scripts/dtc/dtc-lexer.l
@@ -39,7 +39,7 @@ LINECOMMENT	"//".*\n
 #include "srcpos.h"
 #include "dtc-parser.tab.h"
 
-YYLTYPE yylloc;
+extern YYLTYPE yylloc;
 
 /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
 #define	YY_USER_ACTION \
diff --git a/scripts/dtc/dtc-lexer.lex.c_shipped b/scripts/dtc/dtc-lexer.lex.c_shipped
index 2d30f417..d0eb405c 100644
--- a/scripts/dtc/dtc-lexer.lex.c_shipped
+++ b/scripts/dtc/dtc-lexer.lex.c_shipped
@@ -637,7 +637,7 @@ char *yytext;
 #include "srcpos.h"
 #include "dtc-parser.tab.h"
 
-YYLTYPE yylloc;
+extern YYLTYPE yylloc;
 
 /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
 #define	YY_USER_ACTION \