Skip to content

Fix graphics on eng-build (mediatek weirdness) #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NaphatrB wants to merge 2 commits into
base: cm-14.1
Choose a base branch
from
Open

Fix graphics on eng-build (mediatek weirdness) #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c6a1a2
Fix graphics on eng-build (mediatek weirdness)
chaosmaster Apr 14, 2019
494400f
add extern keyword for GCC 10
NaphatrB Nov 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions drivers/misc/mediatek/gpu/ged/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 += \
Expand Down
3 changes: 2 additions & 1 deletion drivers/misc/mediatek/gpu/mt8173/1.5_ED3830101/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 += \
Expand Down
5 changes: 5 additions & 0 deletions drivers/misc/mediatek/gpu/mt8173/1.5_ED3830101/services/server/common/srvcore.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -346,6 +350,7 @@ PVRSRVConnectKM(CONNECTION_DATA *psConnection,
}
#endif

#endif
chk_exit:
return eError;
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/dtc/dtc-lexer.l
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion scripts/dtc/dtc-lexer.lex.c_shipped
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down