select debug mode when profile by default.

diff --git a/mali/Kbuild b/mali/Kbuild
index 25dae8f1ad7bab3c4e8ad1b2134e0494041b6376..9cf4b57d60923b0dafcd3b280a577cef9e4410ba 100644 (file)
--- a/mali/Kbuild
+++ b/mali/Kbuild
@@ -33,10 +33,10 @@ endif
 
 OS_MEMORY_KERNEL_BUFFER_SIZE_IN_MB ?= 16
 
-ifeq ($(CONFIG_MALI400_PROFILING),y)
+ifeq ($(CONFIG_MALI400_UTILIZATION),y)
        USING_GPU_UTILIZATION ?= 1
 else
-       USING_GPU_UTILIZATION ?= 1
+       USING_GPU_UTILIZATION ?= 0
 endif
 PROFILING_SKIP_PP_JOBS ?= 0
 PROFILING_SKIP_PP_AND_GP_JOBS ?= 0

diff --git a/mali/Kconfig b/mali/Kconfig
index 11e7d41eb9d3dad360e96db319acc2334757b3a8..66f91902dc80e2ca1f8ff9fa76751f9da1ed10f5 100644 (file)
--- a/mali/Kconfig
+++ b/mali/Kconfig
@@ -30,7 +30,6 @@ config MALI400_PROFILING_EXTRA_SUPPORT
        depends on MALI400_PROFILING
        select PROFILING
        select FTRACE
-       select MALI400_DEBUG
        select PERF_EVENTS
        select ENABLE_DEFAULT_TRACERS
        select DEBUG_MUTEXES
@@ -41,6 +40,7 @@ config MALI400_PROFILING_EXTRA_SUPPORT
 config MALI400_PROFILING
        bool "Enable Mali profiling"
        depends on MALI400
+       select MALI400_DEBUG
        select TRACEPOINTS
        default n
        ---help---
@@ -53,6 +53,13 @@ config MALI400_INTERNAL_PROFILING
        ---help---
          This enables the internal legacy Mali profiling API.
 
+config MALI400_UTILIZATION
+       bool "Enable Mali Utilization and Frequency and pp scaling."
+       depends on MALI400
+       default y
+       ---help---
+         This enables the frequency and pp scaling.
+
 config MALI400_UMP
        bool "Enable UMP support"
        depends on MALI400

diff --git a/mali/platform/meson8/mali_clock.c b/mali/platform/meson8/mali_clock.c
index 4f994e65c2415fe7636c8db5c1c01904c8419a8a..03a7bc70aea5d8924f5a6b581fab79bea8e1b68e 100644 (file)
--- a/mali/platform/meson8/mali_clock.c
+++ b/mali/platform/meson8/mali_clock.c
@@ -9,7 +9,13 @@
 #include <asm/io.h>
 #include "mali_clock.h"
 
-unsigned int mali_default_clock_step = MALI_CLOCK_318;// MALI_CLOCK_318;
+#ifdef CONFIG_MALI400_UTILIZATION
+#define CUR_MALI_CLOCK MALI_CLOCK_318
+#else
+#define CUR_MALI_CLOCK MALI_CLOCK_637
+#endif
+
+unsigned int mali_default_clock_step = CUR_MALI_CLOCK;// MALI_CLOCK_318;
 
 static DEFINE_SPINLOCK(lock);