rockchip:midgard:1,compatible with rk3288 ft project 2,version to 3

diff --git a/drivers/gpu/arm/midgard/Kbuild b/drivers/gpu/arm/midgard/Kbuild
index 379237198c4c7af629b34b686e01d35ef5949e22..33dc4570bae19abbb57ae2fad58f84e67d5679ef 100755 (executable)
--- a/drivers/gpu/arm/midgard/Kbuild
+++ b/drivers/gpu/arm/midgard/Kbuild
@@ -105,13 +105,16 @@ SRC := \
        mali_kbase_mem_lowlevel.c \
        mali_kbase_debug.c \
        mali_kbase_trace_timeline.c \
-       mali_kbase_gpu_memory_debugfs.c \
        mali_kbase_mem_linux.c \
        mali_kbase_core_linux.c \
        mali_kbase_sync.c \
        mali_kbase_sync_user.c \
        mali_kbase_replay.c \
 
+ifeq ($(CONFIG_DEBUG_FS),y)
+SRC += mali_kbase_gpu_memory_debugfs.c
+endif
+
 ifeq ($(MALI_CUSTOMER_RELEASE),0)
 SRC += \
      mali_kbase_pm_ca_random.c \

diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
index 9cb098ae564b3a31029dae943964c5eb8ff44beb..89f1d0c4aa013430d62ff55cf09d2d0e20021e52 100755 (executable)
--- a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
@@ -85,7 +85,7 @@ EXPORT_SYMBOL(shared_kernel_test_data);
 #endif /* MALI_UNIT_TEST */
 
 #define KBASE_DRV_NAME "mali"
-#define ROCKCHIP_VERSION 2
+#define ROCKCHIP_VERSION 3
 static const char kbase_drv_name[] = KBASE_DRV_NAME;
 
 static int kbase_dev_nr;