mali-driver: fix makefile issue for r25p0 [1/1]

PD#SWPL-40275

Problem:
gpu dvfs work abnormal.

Solution:
fix makefile issue.
sync r-tv-dev to mainline

Verify:
SM1-AC214

Change-Id: I0f8ff9048b330bb40bb1c9874d2f5bd68e584b4d
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>

diff --git a/bifrost/Makefile b/bifrost/Makefile
index 77452952a23920f5d9bba6cceaf45d1269ee7dd2..8a7fdf4ec9f4c6d582569300e0afa3a865521577 100644 (file)
--- a/bifrost/Makefile
+++ b/bifrost/Makefile
@@ -24,13 +24,16 @@ EXTRA_INCLUDE := -I$(KERNEL_SRC)/$(M)/../bifrost/$(GPU_DRV_VERSION)/kernel/drive
                  -I$(KERNEL_SRC)/$(M)/../bifrost/$(GPU_DRV_VERSION)/kernel/drivers/gpu/arm/midgard/ipa \
                  -I$(KERNEL_SRC)/$(M)/../bifrost/$(GPU_DRV_VERSION)/kernel/drivers/gpu/arm/midgard \
                  -I$(KERNEL_SRC)/$(M)/../dvalin/kernel/include
+
+KBUILD_CFLAGS_MODULE += $(GKI_EXT_MODULE_PREDEFINE)
+
 modules:
        $(MAKE) -C $(KERNEL_SRC) M=$(M)/$(GPU_DRV_VERSION)/kernel/drivers/gpu/arm/midgard  \
        EXTRA_CFLAGS="-DCONFIG_MALI_PLATFORM_DEVICETREE -DCONFIG_MALI_MIDGARD_DVFS -DCONFIG_MALI_BACKEND=gpu " \
-       EXTRA_CFLAGS="-DCONFIG_MALI_DMA_BUF_MAP_ON_DEMAND=1 -DCONFIG_MALI_DMA_BUF_LEGACY_COMPAT=0 " \
-       EXTRA_CFLAGS+="-Wno-error -Wno-pointer-sign -Wno-error=frame-larger-than= $(EXTRA_INCLUDE)" \
-       EXTRA_LDFLAGS+="--strip-debug" \
-       CONFIG_MALI_MIDGARD=m CONFIG_MALI_PLATFORM_DEVICETREE=y CONFIG_MALI_MIDGARD_DVFS=y CONFIG_MALI_BACKEND=gpu
+       EXTRA_CFLAGS+="-DCONFIG_MALI_DMA_BUF_MAP_ON_DEMAND=1 -DCONFIG_MALI_DMA_BUF_LEGACY_COMPAT=0 " \
+       EXTRA_CFLAGS+="-Wno-error -Wno-pointer-sign -Wno-error=frame-larger-than= $(EXTRA_INCLUDE) $(KBUILD_CFLAGS_MODULE)" \
+       EXTRA_LDFLAGS+="--strip-debug" \
+       CONFIG_MALI_MIDGARD=m CONFIG_MALI_PLATFORM_DEVICETREE=y CONFIG_MALI_MIDGARD_DVFS=y CONFIG_MALI_BACKEND=gpu
 
 modules_install:
        @$(MAKE) INSTALL_MOD_STRIP=1 M=$(M)/$(GPU_DRV_VERSION)/kernel/drivers/gpu/arm/midgard -C $(KERNEL_SRC) modules_install