rk32 gpu : 1, update rk32 gpu config_attributes 2,delete gpu tracing config and...

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index 3cc28c66fb7e88a4c3f642d427f3d072367bbab9..64dd6cd160d8d4ad39aaab9d74e46eb0bb1452d9 100644 (file)
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -337,18 +337,12 @@ CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_MALI_T6XX=y
-CONFIG_MALI_GATOR_SUPPORT=y
 CONFIG_MALI_T6XX_DVFS=y
 CONFIG_MALI_T6XX_RT_PM=y
-CONFIG_MALI_T6XX_ENABLE_TRACE=y
 CONFIG_MALI_T6XX_DEBUG_SYS=y
 CONFIG_MALI_EXPERT=y
 CONFIG_MALI_DEBUG_SHADER_SPLIT_FS=y
 CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="rk"
-CONFIG_MALI_DEBUG=y
-CONFIG_MALI_TRACE_TIMELINE=y
-CONFIG_MALI_SYSTEM_TRACE=y
-CONFIG_MALI_GPU_TRACEPOINTS=y
 CONFIG_FB=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_LCD_CLASS_DEVICE is not set

diff --git a/drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_config_rk.c b/drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_config_rk.c
index 8e2d41c06a213060d7868e796f47128a080e7211..d3b8875e29385ca6be33416016ebccbd6eb3e907 100755 (executable)
--- a/drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_config_rk.c
+++ b/drivers/gpu/arm/t6xx/kbase/src/platform/rk/mali_kbase_config_rk.c
@@ -277,7 +277,7 @@ static kbase_attribute config_attributes[] = {
         KBASE_CONFIG_ATTR_MEMORY_OS_SHARED_MAX,
         KBASE_VE_MEMORY_OS_SHARED_MAX},
 #endif
-#if 0
+#if 1
        {
         KBASE_CONFIG_ATTR_MEMORY_OS_SHARED_PERF_GPU,
         KBASE_VE_MEMORY_OS_SHARED_PERF_GPU},
@@ -352,7 +352,7 @@ static kbase_attribute config_attributes[] = {
         KBASE_VE_JS_RESET_TICKS_NSS},
 #endif
 #endif                         /* CONFIG_MALI_DEBUG */
-#if 0 
+#if 1
        {
         KBASE_CONFIG_ATTR_JS_RESET_TIMEOUT_MS,
         KBASE_VE_JS_RESET_TIMEOUT_MS},