From bbbb1cf6bb211bb2094dd66656966277c326867f Mon Sep 17 00:00:00 2001 From: Sidath Senanayake Date: Thu, 9 Sep 2021 14:10:15 +0100 Subject: Mali Valhall DDK r32p1 BETA 4 KMD Provenance: 0767a19d2 (collaborate/google/android/v_r32p1-00bet0) VX504X08X-BU-00000-r32p1-00bet4 - Valhall Android DDK VX504X08X-BU-60000-r32p1-00bet4 - Valhall Android Document Bundle VX504X08X-DC-11001-r32p1-00bet4 - Valhall Android DDK Software Errata VX504X08X-SW-99006-r32p1-00bet4 - Valhall Android Renderscript AOSP parts Signed-off-by: Sidath Senanayake Change-Id: I05e6c40ff66850114abc89c47cb838f5347f2862 --- common/include/linux/memory_group_manager.h | 19 ++++++++++--------- common/include/linux/priority_control_manager.h | 2 +- common/include/linux/protected_memory_allocator.h | 6 +++--- common/include/linux/protected_mode_switcher.h | 8 ++++---- .../uapi/gpu/arm/midgard/csf/mali_base_csf_kernel.h | 7 +++---- 5 files changed, 21 insertions(+), 21 deletions(-) (limited to 'common') diff --git a/common/include/linux/memory_group_manager.h b/common/include/linux/memory_group_manager.h index c0e808b..78cd098 100644 --- a/common/include/linux/memory_group_manager.h +++ b/common/include/linux/memory_group_manager.h @@ -46,7 +46,7 @@ struct memory_group_manager_import_data; * @mgm_vmf_insert_pfn_prot: Callback to map a physical memory page for the CPU */ struct memory_group_manager_ops { - /** + /* * mgm_alloc_page - Allocate a physical memory page in a group * * @mgm_dev: The memory group manager through which the request is @@ -65,7 +65,7 @@ struct memory_group_manager_ops { struct memory_group_manager_device *mgm_dev, int group_id, gfp_t gfp_mask, unsigned int order); - /** + /* * mgm_free_page - Free a physical memory page in a group * * @mgm_dev: The memory group manager through which the request @@ -84,7 +84,7 @@ struct memory_group_manager_ops { struct memory_group_manager_device *mgm_dev, int group_id, struct page *page, unsigned int order); - /** + /* * mgm_get_import_memory_id - Get the physical memory group ID for the * imported memory * @@ -103,7 +103,7 @@ struct memory_group_manager_ops { struct memory_group_manager_device *mgm_dev, struct memory_group_manager_import_data *import_data); - /** + /* * mgm_update_gpu_pte - Modify a GPU page table entry for a memory group * * @mgm_dev: The memory group manager through which the request @@ -127,7 +127,7 @@ struct memory_group_manager_ops { u64 (*mgm_update_gpu_pte)(struct memory_group_manager_device *mgm_dev, int group_id, int mmu_level, u64 pte); - /** + /* * mgm_vmf_insert_pfn_prot - Map a physical page in a group for the CPU * * @mgm_dev: The memory group manager through which the request @@ -158,8 +158,9 @@ struct memory_group_manager_ops { * struct memory_group_manager_device - Device structure for a memory group * manager * - * @ops - Callbacks associated with this device - * @data - Pointer to device private data + * @ops: Callbacks associated with this device + * @data: Pointer to device private data + * @owner: pointer to owning module * * In order for a systems integrator to provide custom behaviors for memory * operations performed by the kbase module (controller driver), they must @@ -183,8 +184,8 @@ enum memory_group_manager_import_type { * struct memory_group_manager_import_data - Structure describing the imported * memory * - * @type - type of imported memory - * @u - Union describing the imported memory + * @type: - type of imported memory + * @u: - Union describing the imported memory * */ struct memory_group_manager_import_data { diff --git a/common/include/linux/priority_control_manager.h b/common/include/linux/priority_control_manager.h index 002e78b..a6b1519 100644 --- a/common/include/linux/priority_control_manager.h +++ b/common/include/linux/priority_control_manager.h @@ -34,7 +34,7 @@ struct priority_control_manager_device; * @pcm_scheduler_priority_check: Callback to check if scheduling priority level can be requested */ struct priority_control_manager_ops { - /** + /* * pcm_scheduler_priority_check: This function can be used to check what priority its work * would be treated as based on the requested_priority value. * diff --git a/common/include/linux/protected_memory_allocator.h b/common/include/linux/protected_memory_allocator.h index 1e05bb8..825af48 100644 --- a/common/include/linux/protected_memory_allocator.h +++ b/common/include/linux/protected_memory_allocator.h @@ -46,7 +46,7 @@ struct protected_memory_allocator_device; * @pma_free_page: Callback to free protected memory */ struct protected_memory_allocator_ops { - /** + /* * pma_alloc_page - Allocate protected memory pages * * @pma_dev: The protected memory allocator the request is being made @@ -59,7 +59,7 @@ struct protected_memory_allocator_ops { struct protected_memory_allocator_device *pma_dev, unsigned int order); - /** + /* * pma_get_phys_addr - Get the physical address of the protected memory * allocation * @@ -74,7 +74,7 @@ struct protected_memory_allocator_ops { struct protected_memory_allocator_device *pma_dev, struct protected_memory_allocation *pma); - /** + /* * pma_free_page - Free a page of memory * * @pma_dev: The protected memory allocator the request is being made diff --git a/common/include/linux/protected_mode_switcher.h b/common/include/linux/protected_mode_switcher.h index 1a3c5f7..0f1e6ab 100644 --- a/common/include/linux/protected_mode_switcher.h +++ b/common/include/linux/protected_mode_switcher.h @@ -31,7 +31,7 @@ struct protected_mode_device; * @protected_mode_disable: Callback to disable protected mode for device */ struct protected_mode_ops { - /** + /* * protected_mode_enable() - Enable protected mode on device * @dev: The struct device * @@ -40,7 +40,7 @@ struct protected_mode_ops { int (*protected_mode_enable)( struct protected_mode_device *protected_dev); - /** + /* * protected_mode_disable() - Disable protected mode on device, and * reset device * @dev: The struct device @@ -54,8 +54,8 @@ struct protected_mode_ops { /** * struct protected_mode_device - Device structure for protected mode devices * - * @ops - Callbacks associated with this device - * @data - Pointer to device private data + * @ops: Callbacks associated with this device + * @data: Pointer to device private data * * This structure should be registered with the platform device using * platform_set_drvdata(). diff --git a/common/include/uapi/gpu/arm/midgard/csf/mali_base_csf_kernel.h b/common/include/uapi/gpu/arm/midgard/csf/mali_base_csf_kernel.h index 72572e5..78c328c 100644 --- a/common/include/uapi/gpu/arm/midgard/csf/mali_base_csf_kernel.h +++ b/common/include/uapi/gpu/arm/midgard/csf/mali_base_csf_kernel.h @@ -317,7 +317,6 @@ typedef __u32 base_context_create_flags; * @BASE_KCPU_COMMAND_TYPE_JIT_FREE: jit_free, * @BASE_KCPU_COMMAND_TYPE_GROUP_SUSPEND: group_suspend, * @BASE_KCPU_COMMAND_TYPE_ERROR_BARRIER: error_barrier, - * @BASE_KCPU_COMMAND_TYPE_SAMPLE_TIME: sample_time, */ enum base_kcpu_command_type { BASE_KCPU_COMMAND_TYPE_FENCE_SIGNAL, @@ -426,7 +425,7 @@ struct base_kcpu_command_cqs_set_info { }; /** - * basep_cqs_data_type - Enumeration of CQS Data Types + * typedef basep_cqs_data_type - Enumeration of CQS Data Types * * @BASEP_CQS_DATA_TYPE_U32: The Data Type of a CQS Object's value * is an unsigned 32-bit integer @@ -439,7 +438,7 @@ typedef enum PACKED { } basep_cqs_data_type; /** - * basep_cqs_wait_operation_op - Enumeration of CQS Object Wait + * typedef basep_cqs_wait_operation_op - Enumeration of CQS Object Wait * Operation conditions * * @BASEP_CQS_WAIT_OPERATION_LE: CQS Wait Operation indicating that a @@ -480,7 +479,7 @@ struct base_kcpu_command_cqs_wait_operation_info { }; /** - * basep_cqs_set_operation_op - Enumeration of CQS Set Operations + * typedef basep_cqs_set_operation_op - Enumeration of CQS Set Operations * * @BASEP_CQS_SET_OPERATION_ADD: CQS Set operation for adding a value * to a synchronization object -- cgit v1.2.3