diff options
Diffstat (limited to 'common/include/uapi/gpu/arm')
| -rw-r--r-- | common/include/uapi/gpu/arm/midgard/mali_base_kernel.h | 16 | ||||
| -rw-r--r-- | common/include/uapi/gpu/arm/midgard/mali_kbase_ioctl.h | 18 |
2 files changed, 28 insertions, 6 deletions
diff --git a/common/include/uapi/gpu/arm/midgard/mali_base_kernel.h b/common/include/uapi/gpu/arm/midgard/mali_base_kernel.h index 554c5a3..c7afda8 100644 --- a/common/include/uapi/gpu/arm/midgard/mali_base_kernel.h +++ b/common/include/uapi/gpu/arm/midgard/mali_base_kernel.h @@ -732,6 +732,10 @@ static __inline__ int base_mem_group_id_get(base_mem_alloc_flags flags) BASEP_MEM_GROUP_ID_SHIFT); } +#define BASE_MEM_GROUP_ID_SET(id) \ + (((base_mem_alloc_flags)(id) << BASEP_MEM_GROUP_ID_SHIFT) & \ + BASE_MEM_GROUP_ID_MASK) + /** * base_mem_group_id_set() - Set group ID into base_mem_alloc_flags * @id: group ID(0~15) you want to encode @@ -751,10 +755,14 @@ static __inline__ base_mem_alloc_flags base_mem_group_id_set(int id) id = BASE_MEM_GROUP_DEFAULT; } - return ((base_mem_alloc_flags)id << BASEP_MEM_GROUP_ID_SHIFT) & - BASE_MEM_GROUP_ID_MASK; + return BASE_MEM_GROUP_ID_SET(id); } +#define BASE_CONTEXT_MMU_GROUP_ID_SET(group_id) \ + (BASEP_CONTEXT_MMU_GROUP_ID_MASK & \ + ((base_context_create_flags)(group_id) << \ + BASEP_CONTEXT_MMU_GROUP_ID_SHIFT)) + /** * base_context_mmu_group_id_set - Encode a memory group ID in * base_context_create_flags @@ -770,9 +778,7 @@ static __inline__ base_context_create_flags base_context_mmu_group_id_set( { LOCAL_ASSERT(group_id >= 0); LOCAL_ASSERT(group_id < BASE_MEM_GROUP_COUNT); - return BASEP_CONTEXT_MMU_GROUP_ID_MASK & - ((base_context_create_flags)group_id << - BASEP_CONTEXT_MMU_GROUP_ID_SHIFT); + return BASE_CONTEXT_MMU_GROUP_ID_SET(group_id); } /** diff --git a/common/include/uapi/gpu/arm/midgard/mali_kbase_ioctl.h b/common/include/uapi/gpu/arm/midgard/mali_kbase_ioctl.h index 5ca528a..1546e68 100644 --- a/common/include/uapi/gpu/arm/midgard/mali_kbase_ioctl.h +++ b/common/include/uapi/gpu/arm/midgard/mali_kbase_ioctl.h @@ -674,7 +674,7 @@ struct kbase_ioctl_context_priority_check { #define KBASE_IOCTL_CONTEXT_PRIORITY_CHECK \ _IOWR(KBASE_IOCTL_TYPE, 54, struct kbase_ioctl_context_priority_check) -/** +/* * struct kbase_ioctl_set_limited_core_count - Set the limited core count. * * @max_core_count: Maximum core count @@ -688,6 +688,22 @@ struct kbase_ioctl_set_limited_core_count { /*************** + * Pixel ioctls * + ***************/ + +/** + * struct kbase_ioctl_apc_request - GPU asynchronous power control (APC) request + * + * @dur_usec: Duration for GPU to stay awake. + */ +struct kbase_ioctl_apc_request { + __u32 dur_usec; +}; + +#define KBASE_IOCTL_APC_REQUEST \ + _IOW(KBASE_IOCTL_TYPE, 66, struct kbase_ioctl_apc_request) + +/*************** * test ioctls * ***************/ #if MALI_UNIT_TEST |