MALI: rockchip: upgrade DDK to r8p0-02rel0.

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / arm / midgard / Kbuild

diff --git a/drivers/gpu/arm/midgard/Kbuild b/drivers/gpu/arm/midgard/Kbuild
index f43849831400e74439232472df3dab1881411114..4cb88fe5c0039afb89cb7c584541c00d6f1237a3 100644 (file)
--- a/drivers/gpu/arm/midgard/Kbuild
+++ b/drivers/gpu/arm/midgard/Kbuild
@@ -15,7 +15,7 @@
 
 
 # Driver version string which is returned to userspace via an ioctl
-MALI_RELEASE_NAME ?= "r6p0-02rel0"
+MALI_RELEASE_NAME ?= "r8p0-02rel0"
 
 # Paths required for build
 KBASE_PATH = $(src)
@@ -77,10 +77,10 @@ SRC := \
        mali_kbase_cache_policy.c \
        mali_kbase_mem.c \
        mali_kbase_mmu.c \
+       mali_kbase_ipa.c \
        mali_kbase_jd.c \
        mali_kbase_jd_debugfs.c \
        mali_kbase_jm.c \
-       mali_kbase_cpuprops.c \
        mali_kbase_gpuprops.c \
        mali_kbase_js.c \
        mali_kbase_js_ctx_attr.c \
@@ -88,7 +88,6 @@ SRC := \
        mali_kbase_context.c \
        mali_kbase_pm.c \
        mali_kbase_config.c \
-       mali_kbase_security.c \
        mali_kbase_instr.c \
        mali_kbase_vinstr.c \
        mali_kbase_softjobs.c \
@@ -108,7 +107,10 @@ SRC := \
        mali_kbase_disjoint_events.c \
        mali_kbase_gator_api.c \
        mali_kbase_debug_mem_view.c \
-       mali_kbase_smc.c
+       mali_kbase_debug_job_fault.c \
+       mali_kbase_smc.c \
+       mali_kbase_mem_pool.c \
+       mali_kbase_mem_pool_debugfs.c
 
 ifeq ($(CONFIG_MALI_MIPE_ENABLED),y)
        SRC += mali_kbase_tlstream.c
@@ -117,26 +119,15 @@ ifeq ($(CONFIG_MALI_MIPE_ENABLED),y)
        endif
 endif
 
+ifeq ($(MALI_CUSTOMER_RELEASE),0)
+       SRC += mali_kbase_regs_dump_debugfs.c
+endif
+
 # Job Scheduler Policy: Completely Fair Scheduler
 SRC += mali_kbase_js_policy_cfs.c
 
-ifeq ($(CONFIG_MACH_MANTA),y)
-       SRC += mali_kbase_mem_alloc_carveout.c
-else
-       SRC += mali_kbase_mem_alloc.c
-endif
-
 ccflags-y += -I$(KBASE_PATH)
 
-# in-tree/out-of-tree logic needs to be slightly different to determine if a file is present
-ifeq ($(KBUILD_EXTMOD),)
-# in-tree
-MALI_METRICS_PATH = $(srctree)/drivers/gpu/arm/midgard
-else
-# out-of-tree
-MALI_METRICS_PATH = $(KBUILD_EXTMOD)
-endif
-
 ifeq ($(CONFIG_MALI_PLATFORM_FAKE),y)
        SRC += mali_kbase_platform_fake.c
 
@@ -203,12 +194,6 @@ obj-$(CONFIG_MALI_MIDGARD) += platform/
 endif
 endif
 
-ifeq ($(CONFIG_MALI_PLATFORM_DEVICETREE),y)
-       SRC += platform/devicetree/mali_kbase_runtime_pm.c
-       SRC += platform/devicetree/mali_kbase_config_devicetree.c
-       ccflags-y += -I$(src)/platform/devicetree
-endif
-
 # Tell the Linux build system from which .o file to create the kernel module
 obj-$(CONFIG_MALI_MIDGARD) += mali_kbase.o
 
@@ -239,3 +224,14 @@ mali_kbase-y += $(BACKEND:.c=.o)
 
 ccflags-y += -I$(src)/$(MALI_BACKEND_PATH)/$(CONFIG_MALI_BACKEND_REAL)
 subdir-ccflags-y += -I$(src)/$(MALI_BACKEND_PATH)/$(CONFIG_MALI_BACKEND_REAL)
+
+# Default to devicetree platform if neither a fake platform or a thirdparty
+# platform is configured.
+ifeq ($(CONFIG_MALI_PLATFORM_THIRDPARTY)$(CONFIG_MALI_PLATFORM_FAKE),)
+CONFIG_MALI_PLATFORM_DEVICETREE := y
+endif
+
+mali_kbase-$(CONFIG_MALI_PLATFORM_DEVICETREE) += \
+       platform/devicetree/mali_kbase_runtime_pm.o \
+       platform/devicetree/mali_kbase_config_devicetree.o
+ccflags-$(CONFIG_MALI_PLATFORM_DEVICETREE) += -I$(src)/platform/devicetree