diff options
| author | Mark Brown <broonie@linaro.org> | 2014-08-05 11:46:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-05 11:46:14 +0100 |
| commit | 335ab1659bbf3ecf8dc1ba31e66111d35d54e8c9 (patch) | |
| tree | 02ad2c99f5c728cfd9ac8ed132d987a355ddd5c2 /drivers/gator/gator_events_mali_common.h | |
| parent | 14899ae67197e6e84cecf018f39d1be1a2d75b92 (diff) | |
| parent | ed30f24e8d07d30aa3e69d1f508f4d7bd2e8ea14 (diff) | |
Merge commit 'ed30f24e8d07d30aa3e69d1f508f4d7bd2e8ea14' of git://git.linaro.org/landing-teams/working/arm/kernel into lsk-v3.10-gator
Diffstat (limited to 'drivers/gator/gator_events_mali_common.h')
| -rw-r--r-- | drivers/gator/gator_events_mali_common.h | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/drivers/gator/gator_events_mali_common.h b/drivers/gator/gator_events_mali_common.h index 41c2a3c13fae..91d871bc915a 100644 --- a/drivers/gator/gator_events_mali_common.h +++ b/drivers/gator/gator_events_mali_common.h @@ -18,10 +18,6 @@ #include <linux/slab.h> #include <asm/io.h> -/* Device codes for each known GPU */ -#define MALI_4xx (0x0b07) -#define MALI_T6xx (0x0056) - /* Ensure that MALI_SUPPORT has been defined to something. */ #ifndef MALI_SUPPORT #error MALI_SUPPORT not defined! @@ -35,8 +31,12 @@ * Runtime state information for a counter. */ typedef struct { - unsigned long key; /* 'key' (a unique id set by gatord and returned by gator.ko) */ - unsigned long enabled; /* counter enable state */ + // 'key' (a unique id set by gatord and returned by gator.ko) + unsigned long key; + // counter enable state + unsigned long enabled; + // for activity counters, the number of cores, otherwise -1 + unsigned long cores; } mali_counter; /* @@ -54,17 +54,9 @@ extern void _mali_profiling_control(unsigned int, unsigned int); extern void _mali_profiling_get_counters(unsigned int *, unsigned int *, unsigned int *, unsigned int *); /** - * Returns a name which identifies the GPU type (eg Mali-4xx, Mali-T6xx). - * - * @return The name as a constant string. - */ -extern const char *gator_mali_get_mali_name(void); - -/** * Creates a filesystem entry under /dev/gator relating to the specified event name and key, and * associate the key/enable values with this entry point. * - * @param mali_name A name related to the type of GPU, obtained from a call to gator_mali_get_mali_name() * @param event_name The name of the event. * @param sb Linux super block * @param root Directory under which the entry will be created. |