diff options
| author | Chunsang Jeong <chunsang.jeong@linaro.org> | 2012-04-03 14:49:06 +0900 |
|---|---|---|
| committer | Tushar Behera <tushar.behera@linaro.org> | 2012-04-18 13:15:05 +0530 |
| commit | 580436d48b9914a1700d1e3ca6be1c009eecc222 (patch) | |
| tree | 1f5d7f313e2430346ae5e17d08340cce4279af96 | |
| parent | d914ad4e936f95b3d872b1f0c35fc55217abaa8d (diff) | |
| download | linux-topics-580436d48b9914a1700d1e3ca6be1c009eecc222.tar.gz | |
Changed MALI_API_VERSION to 10 for r2p4-02rel and updated profiling events definition
Signed-off-by: Chunsang Jeong <chunsang.jeong@linaro.org>
| -rw-r--r-- | drivers/gpu/arm/mali/common/mali_uk_types.h | 3 | ||||
| -rw-r--r-- | drivers/gpu/arm/mali/include/cinstr/mali_cinstr_profiling_events_m200.h | 31 |
2 files changed, 28 insertions, 6 deletions
diff --git a/drivers/gpu/arm/mali/common/mali_uk_types.h b/drivers/gpu/arm/mali/common/mali_uk_types.h index a55003ae304..85bb82d0a90 100644 --- a/drivers/gpu/arm/mali/common/mali_uk_types.h +++ b/drivers/gpu/arm/mali/common/mali_uk_types.h @@ -747,8 +747,7 @@ typedef struct * The 16bit integer is stored twice in a 32bit integer * For example, for version 1 the value would be 0x00010001 */ -//#define _MALI_API_VERSION 10 -#define _MALI_API_VERSION 9 +#define _MALI_API_VERSION 10 #define _MALI_UK_API_VERSION _MAKE_VERSION_ID(_MALI_API_VERSION) /** diff --git a/drivers/gpu/arm/mali/include/cinstr/mali_cinstr_profiling_events_m200.h b/drivers/gpu/arm/mali/include/cinstr/mali_cinstr_profiling_events_m200.h index be02f2069aa..49d982ec52c 100644 --- a/drivers/gpu/arm/mali/include/cinstr/mali_cinstr_profiling_events_m200.h +++ b/drivers/gpu/arm/mali/include/cinstr/mali_cinstr_profiling_events_m200.h @@ -1,7 +1,7 @@ /* * This confidential and proprietary software may be used only as * authorised by a licensing agreement from ARM Limited - * (C) COPYRIGHT 2010-2011 ARM Limited + * (C) COPYRIGHT 2010-2012 ARM Limited * ALL RIGHTS RESERVED * The entire notice above must be reproduced on all authorised * copies and copies may only be made to the extent permitted @@ -43,6 +43,11 @@ typedef enum MALI_PROFILING_EVENT_CHANNEL_PP1 = 6 << 16, MALI_PROFILING_EVENT_CHANNEL_PP2 = 7 << 16, MALI_PROFILING_EVENT_CHANNEL_PP3 = 8 << 16, + MALI_PROFILING_EVENT_CHANNEL_PP4 = 9 << 16, + MALI_PROFILING_EVENT_CHANNEL_PP5 = 10 << 16, + MALI_PROFILING_EVENT_CHANNEL_PP6 = 11 << 16, + MALI_PROFILING_EVENT_CHANNEL_PP7 = 12 << 16, + MALI_PROFILING_EVENT_CHANNEL_GPU = 21 << 16, } cinstr_profiling_event_channel_t; @@ -54,9 +59,11 @@ typedef enum */ typedef enum { - MALI_PROFILING_EVENT_REASON_SINGLE_SW_NONE = 0, - MALI_PROFILING_EVENT_REASON_SINGLE_SW_EGL_NEW_FRAME = 1, - MALI_PROFILING_EVENT_REASON_SINGLE_SW_FLUSH = 2, + MALI_PROFILING_EVENT_REASON_SINGLE_SW_NONE = 0, + MALI_PROFILING_EVENT_REASON_SINGLE_SW_EGL_NEW_FRAME = 1, + MALI_PROFILING_EVENT_REASON_SINGLE_SW_FLUSH = 2, + MALI_PROFILING_EVENT_REASON_SINGLE_SW_EGL_SWAP_BUFFERS = 3, + MALI_PROFILING_EVENT_REASON_SINGLE_SW_FB_EVENT = 4 } cinstr_profiling_event_reason_single_sw_t; /** @@ -75,6 +82,14 @@ typedef enum { MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_NONE = 0, MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_PIPELINE_FULL = 1, + MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_VSYNC = 26, + MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_FB_IFRAME_WAIT= 27, + MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_FB_IFRAME_SYNC= 28, + MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_VG_WAIT_FILTER_CLEANUP = 29, + MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_VG_WAIT_TEXTURE = 30, + MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_GLES_WAIT_MIPLEVEL = 31, + MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_GLES_WAIT_READPIXELS = 32, + MALI_PROFILING_EVENT_REASON_SUSPEND_RESUME_SW_EGL_WAIT_SWAP_IMMEDIATE= 33, } cinstr_profiling_event_reason_suspend_resume_sw_t; /** @@ -87,5 +102,13 @@ typedef enum MALI_PROFILING_EVENT_REASON_SINGLE_HW_FLUSH = 2, } cinstr_profiling_event_reason_single_hw_t; +/** + * These events are applicable when the type MALI_PROFILING_EVENT_TYPE_SINGLE is used from the GPU channel + */ +typedef enum +{ + MALI_PROFILING_EVENT_REASON_SINGLE_GPU_NONE = 0, + MALI_PROFILING_EVENT_REASON_SINGLE_GPU_FREQ_VOLT_CHANGE = 1, +} cinstr_profiling_event_reason_single_gpu_t; #endif /*_CINSTR_PROFILING_EVENTS_M200_H_*/ |