MALI: rockchip: upgrade midgard DDK to r11p0-00rel0

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

diff --git a/drivers/gpu/arm/midgard/Kconfig b/drivers/gpu/arm/midgard/Kconfig
index 4f70e31d7b25f327c02d0ee10055e47bade20e8a..8a33841af5a55c7130bb36e2a7f1fb3ccea9582f 100644 (file)
--- a/drivers/gpu/arm/midgard/Kconfig
+++ b/drivers/gpu/arm/midgard/Kconfig
@@ -16,6 +16,7 @@
 
 menuconfig MALI_MIDGARD
        tristate "Mali Midgard series support"
+       select GPU_TRACEPOINTS if ANDROID
        default n
        help
          Enable this option to build support for a ARM Mali Midgard GPU.
@@ -23,38 +24,15 @@ menuconfig MALI_MIDGARD
          To compile this driver as a module, choose M here:
          this will generate a single module, called mali_kbase.
 
-choice
-       prompt "Streamline support"
-       depends on MALI_MIDGARD
-       default MALI_TIMELINE_DISABLED
-       help
-         Select streamline support configuration.
-
-config MALI_TIMELINE_DISABLED
-       bool "Streamline support disabled"
-       help
-         Disable support for ARM Streamline Performance Analyzer.
-
-         Timeline support will not be included in
-         kernel code.
-         Debug stream will not be generated.
-
 config MALI_GATOR_SUPPORT
        bool "Streamline support via Gator"
+       depends on MALI_MIDGARD
+       default n
        help
          Adds diagnostic support for use with the ARM Streamline Performance Analyzer.
          You will need the Gator device driver already loaded before loading this driver when enabling
          Streamline debug support.
-
-config MALI_MIPE_ENABLED
-       bool "Streamline support via MIPE"
-       help
-         Adds diagnostic support for use with the ARM Streamline Performance Analyzer.
-
-         Stream will be transmitted directly to Mali GPU library.
-         Compatible version of the library is required to read debug stream generated by kernel.
-
-endchoice
+         This is a legacy interface required by older versions of Streamline.
 
 config MALI_MIDGARD_DVFS
        bool "Enable legacy DVFS"
@@ -92,6 +70,19 @@ menuconfig MALI_EXPERT
          Enabling this option and modifying the default settings may produce a driver with performance or
          other limitations.
 
+config MALI_PRFCNT_SET_SECONDARY
+       bool "Use secondary set of performance counters"
+       depends on MALI_MIDGARD && MALI_EXPERT
+       default n
+       help
+         Select this option to use secondary set of performance counters. Kernel
+         features that depend on an access to the primary set of counters may
+         become unavailable. Enabling this option will prevent power management
+         from working optimally and may cause instrumentation tools to return
+         bogus results.
+
+         If unsure, say N.
+
 config MALI_DEBUG_SHADER_SPLIT_FS
        bool "Allow mapping of shader cores via sysfs"
        depends on MALI_MIDGARD && MALI_EXPERT
@@ -198,11 +189,4 @@ config MALI_SYSTEM_TRACE
          minimal overhead when not in use. Enable only if you know what
          you are doing.
 
-config MALI_GPU_TRACEPOINTS
-       bool "Enable GPU tracepoints"
-       depends on MALI_MIDGARD && ANDROID
-       select GPU_TRACEPOINTS
-       help
-         Enables GPU tracepoints using Android trace event definitions.
-
 source "drivers/gpu/arm/midgard/platform/Kconfig"