From bc5ad52517372c183bee7fb5daf479cd571ee1c4 Mon Sep 17 00:00:00 2001 From: xxm Date: Mon, 16 Jun 2014 16:18:14 +0800 Subject: [PATCH] rockchip:midgard:1,compatible with rk3288 ft project 2,version to 3 --- drivers/gpu/arm/midgard/Kbuild | 5 ++++- drivers/gpu/arm/midgard/mali_kbase_core_linux.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/arm/midgard/Kbuild b/drivers/gpu/arm/midgard/Kbuild index 379237198c4c..33dc4570bae1 100755 --- 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 9cb098ae564b..89f1d0c4aa01 100755 --- 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; -- 2.34.1