import OT_8063_20170412 mali driver

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / misc / mediatek / gpu / mt8127 / mali / mali / Kbuild

diff --git a/drivers/misc/mediatek/gpu/mt8127/mali/mali/Kbuild b/drivers/misc/mediatek/gpu/mt8127/mali/mali/Kbuild
old mode 100755 (executable)
new mode 100644 (file)
index 7f6abae..64d52cd
--- a/drivers/misc/mediatek/gpu/mt8127/mali/mali/Kbuild
+++ b/drivers/misc/mediatek/gpu/mt8127/mali/mali/Kbuild
@@ -25,31 +25,20 @@ MALI_PP_SCHEDULER_KEEP_SUB_JOB_STARTS_ALIGNED ?= 0
 MALI_PP_SCHEDULER_FORCE_NO_JOB_OVERLAP_BETWEEN_APPS ?= 0
 MALI_UPPER_HALF_SCHEDULING ?= 1
 MALI_ENABLE_CPU_CYCLES ?= 0
-#ifeq ($(FLAG_MTK_BUILD_SYS),1)
-#DRIVER_DIR=$(MTK_PATH_PLATFORM)/drivers/gpu/mali/mali
-#else
-# Get path to driver source from Linux build system
+
 DRIVER_DIR=$(src)
-#endif
+
 
 # For customer releases the Linux Device Drivers will be provided as ARM proprietary and GPL releases:
 # The ARM proprietary product will only include the license/proprietary directory
 # The GPL product will only include the license/gpl directory
-#ifeq ($(wildcard $(DRIVER_DIR)/linux/license/gpl/*),)
-#    ccflags-y += -I$(DRIVER_DIR)/linux/license/proprietary
-#    ifeq ($(CONFIG_MALI400_PROFILING),y)
-#        $(error Profiling is incompatible with non-GPL license)
-#    endif
-#    ifeq ($(CONFIG_PM_RUNTIME),y)
-#       $(error Runtime PM is incompatible with non-GPL license)
-#    endif
-#    ifeq ($(CONFIG_DMA_SHARED_BUFFER),y)
-#        $(error DMA-BUF is incompatible with non-GPL license)
-#    endif
-#    $(error Linux Device integration is incompatible with non-GPL license)
-#else
-     ccflags-y += -I$(DRIVER_DIR)/linux/license/gpl
-#endif
+ccflags-y += -I$(DRIVER_DIR)/linux/license/gpl
+
+ifeq ($(USING_GPU_UTILIZATION), 1)
+    ifeq ($(USING_DVFS), 1)
+        $(error USING_GPU_UTILIZATION conflict with USING_DVFS you can read the Integration Guide to choose which one do you need)
+    endif
+endif
 
 mali-y += \
        linux/mali_osk_atomics.o \
@@ -70,6 +59,12 @@ mali-y += linux/mali_memory.o linux/mali_memory_os_alloc.o
 mali-y += linux/mali_memory_external.o
 mali-y += linux/mali_memory_block_alloc.o
 
+mali-y += \
+       linux/mali_memory_manager.o \
+       linux/mali_memory_virtual.o \
+       linux/mali_memory_util.o \
+       linux/mali_memory_cow.o
+
 mali-y += \
        linux/mali_ukk_mem.o \
        linux/mali_ukk_gp.o \
@@ -82,7 +77,6 @@ mali-y += \
 mali-y += \
        common/mali_kernel_core.o \
        linux/mali_kernel_linux.o \
-       common/mali_kernel_descriptor_mapping.o \
        common/mali_session.o \
        linux/mali_device_pause_resume.o \
        common/mali_kernel_vsync.o \
@@ -98,8 +92,7 @@ mali-y += \
        common/mali_gp_job.o \
        common/mali_soft_job.o \
        common/mali_scheduler.o \
-       common/mali_gp_scheduler.o \
-       common/mali_pp_scheduler.o \
+       common/mali_executor.o \
        common/mali_group.o \
        common/mali_dlbu.o \
        common/mali_broadcast.o \
@@ -107,8 +100,8 @@ mali-y += \
        common/mali_pmu.o \
        common/mali_user_settings_db.o \
        common/mali_kernel_utilization.o \
+       common/mali_control_timer.o \
        common/mali_l2_cache.o \
-       common/mali_dma.o \
        common/mali_timeline.o \
        common/mali_timeline_fence_wait.o \
        common/mali_timeline_sync_fence.o \
@@ -121,6 +114,10 @@ mali-y += \
 mali-y += platform/platform.o
 mali-y += platform/platform_pmm.o
 #mali-$(CONFIG_MTK_MET) += platform/platform_met.o
+ifdef CONFIG_OF
+ccflags-y += -DCONFIG_MALI_DT
+endif
+ccflags-y += -DCONFIG_MALI450
 
 ifneq ($(MALI_PLATFORM_FILES),)
        mali-y += $(MALI_PLATFORM_FILES:.c=.o)
@@ -134,10 +131,11 @@ ccflags-$(CONFIG_MALI400_INTERNAL_PROFILING) += -I$(DRIVER_DIR)/timestamp-$(TIME
 
 mali-$(CONFIG_DMA_SHARED_BUFFER) += linux/mali_memory_dma_buf.o
 mali-$(CONFIG_SYNC) += linux/mali_sync.o
+ccflags-$(CONFIG_SYNC) += -Idrivers/staging/android
 
 mali-$(CONFIG_MALI400_UMP) += linux/mali_memory_ump.o
 
-mali-$(CONFIG_MALI400_POWER_PERFORMANCE_POLICY) += common/mali_power_performance_policy.o
+mali-$(CONFIG_MALI_DVFS) += common/mali_dvfs_policy.o
 
 # Tell the Linux build system from which .o file to create the kernel module
 obj-$(CONFIG_MALI400) := mali.o
@@ -145,9 +143,6 @@ obj-$(CONFIG_MALI400) := mali.o
 ccflags-y += $(EXTRA_DEFINES)
 
 # Set up our defines, which will be passed to gcc
-ccflags-y += -DPROFILING_SKIP_PP_JOBS=$(PROFILING_SKIP_PP_JOBS)
-ccflags-y += -DPROFILING_SKIP_PP_AND_GP_JOBS=$(PROFILING_SKIP_PP_AND_GP_JOBS)
-
 ccflags-y += -DMALI_PP_SCHEDULER_FORCE_NO_JOB_OVERLAP=$(MALI_PP_SCHEDULER_FORCE_NO_JOB_OVERLAP)
 ccflags-y += -DMALI_PP_SCHEDULER_KEEP_SUB_JOB_STARTS_ALIGNED=$(MALI_PP_SCHEDULER_KEEP_SUB_JOB_STARTS_ALIGNED)
 ccflags-y += -DMALI_PP_SCHEDULER_FORCE_NO_JOB_OVERLAP_BETWEEN_APPS=$(MALI_PP_SCHEDULER_FORCE_NO_JOB_OVERLAP_BETWEEN_APPS)
@@ -164,7 +159,7 @@ ccflags-$(CONFIG_MALI400_UMP) += -I$(DRIVER_DIR)/../../ump/include/ump
 ccflags-$(CONFIG_MALI400_DEBUG) += -DDEBUG
 
 # Use our defines when compiling
-ccflags-y += -I$(DRIVER_DIR) -I$(DRIVER_DIR)/include -I$(DRIVER_DIR)/common -I$(DRIVER_DIR)/linux -I$(DRIVER_DIR)/platform
+ccflags-y += -I$(DRIVER_DIR) -I$(DRIVER_DIR)/include -I$(DRIVER_DIR)/common -I$(DRIVER_DIR)/linux -I$(DRIVER_DIR)/platform -Wno-date-time
 
 # Get subversion revision number, fall back to only ${MALI_RELEASE_NAME} if no svn info is available
 MALI_RELEASE_NAME=$(shell cat $(DRIVER_DIR)/.version 2> /dev/null)
@@ -198,11 +193,8 @@ endif
 
 ccflags-y += -DSVN_REV_STRING=\"$(DRIVER_REV)\"
 
-#Add staging include for android ..
-ccflags-y += -I$(srctree)/drivers/staging/android
-
 VERSION_STRINGS :=
-VERSION_STRINGS += API_VERSION=$(shell grep "\#define _MALI_API_VERSION" $(srctree)/$(DRIVER_DIR)/include/linux/mali/mali_utgard_uk_types.h | cut -d' ' -f 3 )
+VERSION_STRINGS += API_VERSION=$(shell cd $(DRIVER_DIR); grep "\#define _MALI_API_VERSION" $(FILES_PREFIX)include/linux/mali/mali_utgard_uk_types.h | cut -d' ' -f 3 )
 VERSION_STRINGS += REPO_URL=$(REPO_URL)
 VERSION_STRINGS += REVISION=$(DRIVER_REV)
 VERSION_STRINGS += CHANGED_REVISION=$(CHANGED_REVISION)
@@ -221,11 +213,9 @@ VERSION_STRINGS += USING_UMP=$(CONFIG_MALI400_UMP)
 VERSION_STRINGS += USING_PROFILING=$(CONFIG_MALI400_PROFILING)
 VERSION_STRINGS += USING_INTERNAL_PROFILING=$(CONFIG_MALI400_INTERNAL_PROFILING)
 VERSION_STRINGS += USING_GPU_UTILIZATION=$(USING_GPU_UTILIZATION)
-VERSION_STRINGS += USING_POWER_PERFORMANCE_POLICY=$(CONFIG_POWER_PERFORMANCE_POLICY)
+VERSION_STRINGS += USING_DVFS=$(CONFIG_MALI_DVFS)
 VERSION_STRINGS += MALI_UPPER_HALF_SCHEDULING=$(MALI_UPPER_HALF_SCHEDULING)
 
-
-
 #MTK port custom Kbuild
 #To Add 1.ccflags-y 2.SRC
 include $(DRIVER_DIR)/Kbuild-mtk-custom-src