drm/amdgpu: Use function pointer for some mmhub functions
Subsystems (3)
PATCH 1/1 drm/amdgpu: Use function pointer for some mmhub functions
Add more function pointers to amdgpu_mmhub_funcs. ASIC specific implementation of most mmhub functions are called from a general function pointer, instead of calling different function for different ASIC. Simplify the code by deleting duplicate functions
--- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 21 ++-------- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 3 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 13 ++++++ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 13 +++--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 48 ++++++---------------- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 27 ++++++++---- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 14 ------- drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 25 +++++++---- drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.h | 11 +---- drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 24 +++++++---- drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 12 ------ 12 files changed, 94 insertions(+), 121 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c +3 -18
@@ -284,22 +284,6 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd,return 0 ; } -static void kgd_set_vm_context_page_table_base (struct kgd_dev *kgd,uint32_t vmid, -uint64_t page_table_base) -{ -struct amdgpu_device *adev =get_amdgpu_device (kgd); - -if (!amdgpu_amdkfd_is_kfd_vmid (adev, vmid)) { -pr_err ("trying to set page table base for wrong VMID %u\n" , - vmid); -return ; - } - -mmhub_v9_4_setup_vm_pt_regs (adev, vmid, page_table_base); - -gfxhub_v1_0_setup_vm_pt_regs (adev, vmid, page_table_base); -} -const struct kfd2kgd_calls arcturus_kfd2kgd = { .program_sh_mem_settings = kgd_gfx_v9_program_sh_mem_settings, .set_pasid_vmid_mapping = kgd_gfx_v9_set_pasid_vmid_mapping,
@@ -318,7 +302,8 @@ const struct kfd2kgd_calls arcturus_kfd2kgd = { .wave_control_execute = kgd_gfx_v9_wave_control_execute, .address_watch_get_offset = kgd_gfx_v9_address_watch_get_offset, .get_atc_vmid_pasid_mapping_info = - kgd_gfx_v9_get_atc_vmid_pasid_mapping_info, - .set_vm_context_page_table_base = kgd_set_vm_context_page_table_base, + kgd_gfx_v9_get_atc_vmid_pasid_mapping_info, + .set_vm_context_page_table_base = + kgd_gfx_v9_set_vm_context_page_table_base, .get_hive_id = amdgpu_amdkfd_get_hive_id, };
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +2 -2
@@ -679,7 +679,7 @@ uint32_t kgd_gfx_v9_address_watch_get_offset(struct kgd_dev *kgd,return 0 ; } -static void kgd_gfx_v9_set_vm_context_page_table_base (struct kgd_dev *kgd, +void kgd_gfx_v9_set_vm_context_page_table_base (struct kgd_dev *kgd,uint32_t vmid,uint64_t page_table_base) {struct amdgpu_device *adev =get_amdgpu_device (kgd);
@@ -690,7 +690,7 @@ static void kgd_gfx_v9_set_vm_context_page_table_base(struct kgd_dev *kgd,return ; } -mmhub_v1_0_setup_vm_pt_regs (adev, vmid, page_table_base); + adev->mmhub.funcs->setup_vm_pt_regs (adev, vmid, page_table_base);gfxhub_v1_0_setup_vm_pt_regs (adev, vmid, page_table_base); }
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h +3 -0
@@ -60,3 +60,6 @@ uint32_t kgd_gfx_v9_address_watch_get_offset(struct kgd_dev *kgd,bool kgd_gfx_v9_get_atc_vmid_pasid_mapping_info (struct kgd_dev *kgd,uint8_t vmid,uint16_t *p_pasid); + +void kgd_gfx_v9_set_vm_context_page_table_base (struct kgd_dev *kgd, +uint32_t vmid,uint64_t page_table_base);
drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h +13 -0
@@ -27,6 +27,19 @@ struct amdgpu_mmhub_funcs {void (*query_ras_error_count)(struct amdgpu_device *adev,void *ras_error_status);void (*reset_ras_error_count)(struct amdgpu_device *adev); +u64 (*get_fb_location)(struct amdgpu_device *adev); +void (*init)(struct amdgpu_device *adev); +int (*gart_enable)(struct amdgpu_device *adev); +void (*set_fault_enable_default)(struct amdgpu_device *adev, +bool value); +void (*gart_disable)(struct amdgpu_device *adev); +int (*set_clockgating)(struct amdgpu_device *adev, +enum amd_clockgating_state state); +void (*get_clockgating)(struct amdgpu_device *adev,u32 *flags); +void (*setup_vm_pt_regs)(struct amdgpu_device *adev,uint32_t vmid, +uint64_t page_table_base); +void (*update_power_gating)(struct amdgpu_device *adev, +bool enable); };struct amdgpu_mmhub {
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +7 -6
@@ -631,6 +631,7 @@ static int gmc_v10_0_early_init(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; + adev->mmhub.funcs = &mmhub_v2_0_funcs;gmc_v10_0_set_gmc_funcs (adev);gmc_v10_0_set_irq_funcs (adev);gmc_v10_0_set_umc_funcs (adev);
@@ -775,7 +776,7 @@ static int gmc_v10_0_sw_init(void *handle)else gfxhub_v2_0_init (adev); -mmhub_v2_0_init (adev); + adev->mmhub.funcs->init (adev);spin_lock_init (&adev->gmc.invalidate_lock);
@@ -944,7 +945,7 @@ static int gmc_v10_0_gart_enable(struct amdgpu_device *adev)if (r)return r; - r =mmhub_v2_0_gart_enable (adev); + r = adev->mmhub.funcs->gart_enable (adev);if (r)return r;
@@ -966,7 +967,7 @@ static int gmc_v10_0_gart_enable(struct amdgpu_device *adev)gfxhub_v2_1_set_fault_enable_default (adev, value); elsegfxhub_v2_0_set_fault_enable_default (adev ,value ); -mmhub_v2_0_set_fault_enable_default (adev, value); + adev->mmhub.funcs->set_fault_enable_default (adev, value);gmc_v10_0_flush_gpu_tlb (adev,0 ,AMDGPU_MMHUB_0 ,0 );gmc_v10_0_flush_gpu_tlb (adev,0 ,AMDGPU_GFXHUB_0 ,0 );
@@ -1011,7 +1012,7 @@ static void gmc_v10_0_gart_disable(struct amdgpu_device *adev)gfxhub_v2_1_gart_disable (adev); elsegfxhub_v2_0_gart_disable (adev ); -mmhub_v2_0_gart_disable (adev); + adev->mmhub.funcs->gart_disable (adev);amdgpu_gart_table_vram_unpin (adev); }
@@ -1078,7 +1079,7 @@ static int gmc_v10_0_set_clockgating_state(void *handle,int r;struct amdgpu_device *adev = (struct amdgpu_device *)handle; - r =mmhub_v2_0_set_clockgating (adev, state); + r = adev->mmhub.funcs->set_clockgating (adev, state);if (r)return r;
@@ -1093,7 +1094,7 @@ static void gmc_v10_0_get_clockgating_state(void *handle, u32 *flags) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -mmhub_v2_0_get_clockgating (adev, flags); + adev->mmhub.funcs->get_clockgating (adev, flags);if (adev->asic_type ==CHIP_SIENNA_CICHLID || adev->asic_type ==CHIP_NAVY_FLOUNDER )
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +13 -35
107 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +18 -9
@@ -34,7 +34,7 @@#define mmDAGB0_CNTL_MISC2_RV 0x008f#define mmDAGB0_CNTL_MISC2_RV_BASE_IDX 0 -u64 mmhub_v1_0_get_fb_location (struct amdgpu_device *adev) +static u64 mmhub_v1_0_get_fb_location (struct amdgpu_device *adev) {u64 base =RREG32_SOC15 (MMHUB ,0 , mmMC_VM_FB_LOCATION_BASE);u64 top =RREG32_SOC15 (MMHUB ,0 , mmMC_VM_FB_LOCATION_TOP);
@@ -51,7 +51,7 @@ u64 mmhub_v1_0_get_fb_location(struct amdgpu_device *adev)return base; } -void mmhub_v1_0_setup_vm_pt_regs (struct amdgpu_device *adev,uint32_t vmid, +static void mmhub_v1_0_setup_vm_pt_regs (struct amdgpu_device *adev,uint32_t vmid,uint64_t page_table_base) {struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0 ];
@@ -297,7 +297,7 @@ static void mmhub_v1_0_program_invalidation(struct amdgpu_device *adev) } } -void mmhub_v1_0_update_power_gating (struct amdgpu_device *adev, +static void mmhub_v1_0_update_power_gating (struct amdgpu_device *adev,bool enable) {if (amdgpu_sriov_vf (adev))
@@ -310,7 +310,7 @@ void mmhub_v1_0_update_power_gating(struct amdgpu_device *adev, } } -int mmhub_v1_0_gart_enable (struct amdgpu_device *adev) +static int mmhub_v1_0_gart_enable (struct amdgpu_device *adev) {if (amdgpu_sriov_vf (adev)) {/*
@@ -338,7 +338,7 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev)return 0 ; } -void mmhub_v1_0_gart_disable (struct amdgpu_device *adev) +static void mmhub_v1_0_gart_disable (struct amdgpu_device *adev) {struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0 ];u32 tmp;
@@ -373,7 +373,7 @@ void mmhub_v1_0_gart_disable(struct amdgpu_device *adev)* @adev: amdgpu_device pointer * @value: true redirects VM faults to the default page */ -void mmhub_v1_0_set_fault_enable_default (struct amdgpu_device *adev,bool value) +static void mmhub_v1_0_set_fault_enable_default (struct amdgpu_device *adev,bool value) {u32 tmp;
@@ -415,7 +415,7 @@ void mmhub_v1_0_set_fault_enable_default(struct amdgpu_device *adev, bool value)WREG32_SOC15 (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL, tmp); } -void mmhub_v1_0_init (struct amdgpu_device *adev) +static void mmhub_v1_0_init (struct amdgpu_device *adev) {struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0 ];
@@ -525,7 +525,7 @@ static void mmhub_v1_0_update_medium_grain_light_sleep(struct amdgpu_device *adeWREG32_SOC15 (MMHUB ,0 , mmATC_L2_MISC_CG, data); } -int mmhub_v1_0_set_clockgating (struct amdgpu_device *adev, +static int mmhub_v1_0_set_clockgating (struct amdgpu_device *adev,enum amd_clockgating_state state) {if (amdgpu_sriov_vf (adev))
@@ -549,7 +549,7 @@ int mmhub_v1_0_set_clockgating(struct amdgpu_device *adev,return 0 ; } -void mmhub_v1_0_get_clockgating (struct amdgpu_device *adev,u32 *flags) +static void mmhub_v1_0_get_clockgating (struct amdgpu_device *adev,u32 *flags) {int data, data1;
@@ -781,4 +781,13 @@ const struct amdgpu_mmhub_funcs mmhub_v1_0_funcs = { .ras_late_init = amdgpu_mmhub_ras_late_init, .query_ras_error_count = mmhub_v1_0_query_ras_error_count, .reset_ras_error_count = mmhub_v1_0_reset_ras_error_count, + .get_fb_location = mmhub_v1_0_get_fb_location, + .init = mmhub_v1_0_init, + .gart_enable = mmhub_v1_0_gart_enable, + .set_fault_enable_default = mmhub_v1_0_set_fault_enable_default, + .gart_disable = mmhub_v1_0_gart_disable, + .set_clockgating = mmhub_v1_0_set_clockgating, + .get_clockgating = mmhub_v1_0_get_clockgating, + .setup_vm_pt_regs = mmhub_v1_0_setup_vm_pt_regs, + .update_power_gating = mmhub_v1_0_update_power_gating, };
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h +0 -14
@@ -25,18 +25,4 @@extern const struct amdgpu_mmhub_funcs mmhub_v1_0_funcs; -u64 mmhub_v1_0_get_fb_location (struct amdgpu_device *adev); -int mmhub_v1_0_gart_enable (struct amdgpu_device *adev); -void mmhub_v1_0_gart_disable (struct amdgpu_device *adev); -void mmhub_v1_0_set_fault_enable_default (struct amdgpu_device *adev, -bool value); -void mmhub_v1_0_init (struct amdgpu_device *adev); -int mmhub_v1_0_set_clockgating (struct amdgpu_device *adev, -enum amd_clockgating_state state); -void mmhub_v1_0_get_clockgating (struct amdgpu_device *adev,u32 *flags); -void mmhub_v1_0_update_power_gating (struct amdgpu_device *adev, -bool enable); -void mmhub_v1_0_setup_vm_pt_regs (struct amdgpu_device *adev,uint32_t vmid, -uint64_t page_table_base); -#endif
drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c +18 -7
@@ -83,7 +83,7 @@ mmhub_v2_0_print_l2_protection_fault_status(struct amdgpu_device *adev, MMVM_L2_PROTECTION_FAULT_STATUS, RW)); } -void mmhub_v2_0_setup_vm_pt_regs (struct amdgpu_device *adev,uint32_t vmid, +static void mmhub_v2_0_setup_vm_pt_regs (struct amdgpu_device *adev,uint32_t vmid,uint64_t page_table_base) {struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0 ];
@@ -327,7 +327,7 @@ static void mmhub_v2_0_program_invalidation(struct amdgpu_device *adev) } } -int mmhub_v2_0_gart_enable (struct amdgpu_device *adev) +static int mmhub_v2_0_gart_enable (struct amdgpu_device *adev) {/* GART Enable. */ mmhub_v2_0_init_gart_aperture_regs (adev);
@@ -343,7 +343,7 @@ int mmhub_v2_0_gart_enable(struct amdgpu_device *adev)return 0 ; } -void mmhub_v2_0_gart_disable (struct amdgpu_device *adev) +static void mmhub_v2_0_gart_disable (struct amdgpu_device *adev) {struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0 ];u32 tmp;
@@ -374,7 +374,7 @@ void mmhub_v2_0_gart_disable(struct amdgpu_device *adev)* @adev: amdgpu_device pointer * @value: true redirects VM faults to the default page */ -void mmhub_v2_0_set_fault_enable_default (struct amdgpu_device *adev,bool value) +static void mmhub_v2_0_set_fault_enable_default (struct amdgpu_device *adev,bool value) {u32 tmp;
@@ -422,7 +422,7 @@ static const struct amdgpu_vmhub_funcs mmhub_v2_0_vmhub_funcs = { .get_invalidate_req = mmhub_v2_0_get_invalidate_req, }; -void mmhub_v2_0_init (struct amdgpu_device *adev) +static void mmhub_v2_0_init (struct amdgpu_device *adev) {struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0 ];
@@ -552,7 +552,7 @@ static void mmhub_v2_0_update_medium_grain_light_sleep(struct amdgpu_device *ade } } -int mmhub_v2_0_set_clockgating (struct amdgpu_device *adev, +static int mmhub_v2_0_set_clockgating (struct amdgpu_device *adev,enum amd_clockgating_state state) {if (amdgpu_sriov_vf (adev))
@@ -576,7 +576,7 @@ int mmhub_v2_0_set_clockgating(struct amdgpu_device *adev,return 0 ; } -void mmhub_v2_0_get_clockgating (struct amdgpu_device *adev,u32 *flags) +static void mmhub_v2_0_get_clockgating (struct amdgpu_device *adev,u32 *flags) {int data, data1;
@@ -609,3 +609,14 @@ void mmhub_v2_0_get_clockgating(struct amdgpu_device *adev, u32 *flags)if (data &MM_ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK ) *flags |=AMD_CG_SUPPORT_MC_LS ; } + +const struct amdgpu_mmhub_funcs mmhub_v2_0_funcs = { + .ras_late_init = amdgpu_mmhub_ras_late_init, + .init = mmhub_v2_0_init, + .gart_enable = mmhub_v2_0_gart_enable, + .set_fault_enable_default = mmhub_v2_0_set_fault_enable_default, + .gart_disable = mmhub_v2_0_gart_disable, + .set_clockgating = mmhub_v2_0_set_clockgating, + .get_clockgating = mmhub_v2_0_get_clockgating, + .setup_vm_pt_regs = mmhub_v2_0_setup_vm_pt_regs, +};
drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.h +1 -10
@@ -23,15 +23,6 @@#ifndef __MMHUB_V2_0_H__#define __MMHUB_V2_0_H__ -int mmhub_v2_0_gart_enable (struct amdgpu_device *adev); -void mmhub_v2_0_gart_disable (struct amdgpu_device *adev); -void mmhub_v2_0_set_fault_enable_default (struct amdgpu_device *adev, -bool value); -void mmhub_v2_0_init (struct amdgpu_device *adev); -int mmhub_v2_0_set_clockgating (struct amdgpu_device *adev, -enum amd_clockgating_state state); -void mmhub_v2_0_get_clockgating (struct amdgpu_device *adev,u32 *flags); -void mmhub_v2_0_setup_vm_pt_regs (struct amdgpu_device *adev,uint32_t vmid, -uint64_t page_table_base); +extern const struct amdgpu_mmhub_funcs mmhub_v2_0_funcs;#endif
drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c +16 -8
@@ -36,7 +36,7 @@#define MMHUB_NUM_INSTANCES 2#define MMHUB_INSTANCE_REGISTER_OFFSET 0x3000 -u64 mmhub_v9_4_get_fb_location (struct amdgpu_device *adev) +static u64 mmhub_v9_4_get_fb_location (struct amdgpu_device *adev) {/* The base should be same b/t 2 mmhubs on Acrturus. Read one here. */ u64 base =RREG32_SOC15 (MMHUB ,0 , mmVMSHAREDVC0_MC_VM_FB_LOCATION_BASE);
@@ -97,7 +97,7 @@ static void mmhub_v9_4_init_gart_aperture_regs(struct amdgpu_device *adev, (u32)(adev->gmc.gart_end >> 44)); } -void mmhub_v9_4_setup_vm_pt_regs (struct amdgpu_device *adev,uint32_t vmid, +static void mmhub_v9_4_setup_vm_pt_regs (struct amdgpu_device *adev,uint32_t vmid,uint64_t page_table_base) {int i;
@@ -375,7 +375,7 @@ static void mmhub_v9_4_program_invalidation(struct amdgpu_device *adev, } } -int mmhub_v9_4_gart_enable (struct amdgpu_device *adev) +static int mmhub_v9_4_gart_enable (struct amdgpu_device *adev) {int i;
@@ -397,7 +397,7 @@ int mmhub_v9_4_gart_enable(struct amdgpu_device *adev)return 0 ; } -void mmhub_v9_4_gart_disable (struct amdgpu_device *adev) +static void mmhub_v9_4_gart_disable (struct amdgpu_device *adev) {struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0 ];u32 tmp;
@@ -442,7 +442,7 @@ void mmhub_v9_4_gart_disable(struct amdgpu_device *adev)* @adev: amdgpu_device pointer * @value: true redirects VM faults to the default page */ -void mmhub_v9_4_set_fault_enable_default (struct amdgpu_device *adev,bool value) +static void mmhub_v9_4_set_fault_enable_default (struct amdgpu_device *adev,bool value) {u32 tmp;int i;
@@ -500,7 +500,7 @@ void mmhub_v9_4_set_fault_enable_default(struct amdgpu_device *adev, bool value) } } -void mmhub_v9_4_init (struct amdgpu_device *adev) +static void mmhub_v9_4_init (struct amdgpu_device *adev) {struct amdgpu_vmhub *hub[MMHUB_NUM_INSTANCES ] = {&adev->vmhub[AMDGPU_MMHUB_0 ], &adev->vmhub[AMDGPU_MMHUB_1 ]};
@@ -630,7 +630,7 @@ static void mmhub_v9_4_update_medium_grain_light_sleep(struct amdgpu_device *ade } } -int mmhub_v9_4_set_clockgating (struct amdgpu_device *adev, +static int mmhub_v9_4_set_clockgating (struct amdgpu_device *adev,enum amd_clockgating_state state) {if (amdgpu_sriov_vf (adev))
@@ -650,7 +650,7 @@ int mmhub_v9_4_set_clockgating(struct amdgpu_device *adev,return 0 ; } -void mmhub_v9_4_get_clockgating (struct amdgpu_device *adev,u32 *flags) +static void mmhub_v9_4_get_clockgating (struct amdgpu_device *adev,u32 *flags) {int data, data1;
@@ -1628,4 +1628,12 @@ const struct amdgpu_mmhub_funcs mmhub_v9_4_funcs = { .ras_late_init = amdgpu_mmhub_ras_late_init, .query_ras_error_count = mmhub_v9_4_query_ras_error_count, .reset_ras_error_count = mmhub_v9_4_reset_ras_error_count, + .get_fb_location = mmhub_v9_4_get_fb_location, + .init = mmhub_v9_4_init, + .gart_enable = mmhub_v9_4_gart_enable, + .set_fault_enable_default = mmhub_v9_4_set_fault_enable_default, + .gart_disable = mmhub_v9_4_gart_disable, + .set_clockgating = mmhub_v9_4_set_clockgating, + .get_clockgating = mmhub_v9_4_get_clockgating, + .setup_vm_pt_regs = mmhub_v9_4_setup_vm_pt_regs, };
drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h +0 -12
@@ -25,16 +25,4 @@extern const struct amdgpu_mmhub_funcs mmhub_v9_4_funcs; -u64 mmhub_v9_4_get_fb_location (struct amdgpu_device *adev); -int mmhub_v9_4_gart_enable (struct amdgpu_device *adev); -void mmhub_v9_4_gart_disable (struct amdgpu_device *adev); -void mmhub_v9_4_set_fault_enable_default (struct amdgpu_device *adev, -bool value); -void mmhub_v9_4_init (struct amdgpu_device *adev); -int mmhub_v9_4_set_clockgating (struct amdgpu_device *adev, -enum amd_clockgating_state state); -void mmhub_v9_4_get_clockgating (struct amdgpu_device *adev,u32 *flags); -void mmhub_v9_4_setup_vm_pt_regs (struct amdgpu_device *adev,uint32_t vmid, -uint64_t page_table_base); -#endif
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 123 lines · Oak Zeng
Add more function pointers to
amdgpu_mmhub_funcs. ASIC specific implementation of most mmhub functions are called from a general function pointer, instead of calling different function for different ASIC. Simplify the code by deleting duplicate functionsChange-Id I65ba660c69b74c7e779190c4f92e9d7138f7c7d4Signed-off-by Oak Zeng <[email protected]>--- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 21 ++-------- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 3 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 13 ++++++ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 13 +++--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 48 ++++++---------------- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 27 ++++++++---- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 14 ------- drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 25 +++++++---- drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.h | 11 +---- drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 24 +++++++---- drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 12 ------ 12 files changed, 94 insertions(+), 121 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c +3
-18@@ -284,22 +284,6 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd,return 0 ; } -static void kgd_set_vm_context_page_table_base (struct kgd_dev *kgd,uint32_t vmid, -uint64_t page_table_base) -{ -struct amdgpu_device *adev =get_amdgpu_device (kgd); - -if (!amdgpu_amdkfd_is_kfd_vmid (adev, vmid)) { -pr_err ("trying to set page table base for wrong VMID %u\n" , - vmid); -return ; - } - -mmhub_v9_4_setup_vm_pt_regs (adev, vmid, page_table_base); - -gfxhub_v1_0_setup_vm_pt_regs (adev, vmid, page_table_base); -} -const struct kfd2kgd_calls arcturus_kfd2kgd = { .program_sh_mem_settings = kgd_gfx_v9_program_sh_mem_settings, .set_pasid_vmid_mapping = kgd_gfx_v9_set_pasid_vmid_mapping,@@ -318,7 +302,8 @@ const struct kfd2kgd_calls arcturus_kfd2kgd = { .wave_control_execute = kgd_gfx_v9_wave_control_execute, .address_watch_get_offset = kgd_gfx_v9_address_watch_get_offset, .get_atc_vmid_pasid_mapping_info = - kgd_gfx_v9_get_atc_vmid_pasid_mapping_info, - .set_vm_context_page_table_base = kgd_set_vm_context_page_table_base, + kgd_gfx_v9_get_atc_vmid_pasid_mapping_info, + .set_vm_context_page_table_base = + kgd_gfx_v9_set_vm_context_page_table_base, .get_hive_id = amdgpu_amdkfd_get_hive_id, };drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +2
-2@@ -679,7 +679,7 @@ uint32_t kgd_gfx_v9_address_watch_get_offset(struct kgd_dev *kgd,return 0 ; } -static void kgd_gfx_v9_set_vm_context_page_table_base (struct kgd_dev *kgd, +void kgd_gfx_v9_set_vm_context_page_table_base (struct kgd_dev *kgd,uint32_t vmid,uint64_t page_table_base) {struct amdgpu_device *adev =get_amdgpu_device (kgd);@@ -690,7 +690,7 @@ static void kgd_gfx_v9_set_vm_context_page_table_base(struct kgd_dev *kgd,return ; } -mmhub_v1_0_setup_vm_pt_regs (adev, vmid, page_table_base); + adev->mmhub.funcs->setup_vm_pt_regs (adev, vmid, page_table_base);gfxhub_v1_0_setup_vm_pt_regs (adev, vmid, page_table_base); }drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h +3
-0@@ -60,3 +60,6 @@ uint32_t kgd_gfx_v9_address_watch_get_offset(struct kgd_dev *kgd,bool kgd_gfx_v9_get_atc_vmid_pasid_mapping_info (struct kgd_dev *kgd,uint8_t vmid,uint16_t *p_pasid); + +void kgd_gfx_v9_set_vm_context_page_table_base (struct kgd_dev *kgd, +uint32_t vmid,uint64_t page_table_base);drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h +13
-0@@ -27,6 +27,19 @@ struct amdgpu_mmhub_funcs {void (*query_ras_error_count)(struct amdgpu_device *adev,void *ras_error_status);void (*reset_ras_error_count)(struct amdgpu_device *adev); +u64 (*get_fb_location)(struct amdgpu_device *adev); +void (*init)(struct amdgpu_device *adev); +int (*gart_enable)(struct amdgpu_device *adev); +void (*set_fault_enable_default)(struct amdgpu_device *adev, +bool value); +void (*gart_disable)(struct amdgpu_device *adev); +int (*set_clockgating)(struct amdgpu_device *adev, +enum amd_clockgating_state state); +void (*get_clockgating)(struct amdgpu_device *adev,u32 *flags); +void (*setup_vm_pt_regs)(struct amdgpu_device *adev,uint32_t vmid, +uint64_t page_table_base); +void (*update_power_gating)(struct amdgpu_device *adev, +bool enable); };struct amdgpu_mmhub {drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +0
-0
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c static int gmc_v10_0_early_init(void *handle) · line 634
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +1
-0@@ -631,6 +631,7 @@ static int gmc_v10_0_early_init(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; + adev->mmhub.funcs = &mmhub_v2_0_funcs;
Maybe add a gmc_v10_set_mmhub_funcs() function for consistency with other families? With that fixed:
Also, it looks like gfxhub could use a similar clean up. Care to take a look at that as well?
Thanks,
Alex
Quoted 515 lines
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +6
-6gmc_v10_0_set_gmc_funcs (adev);gmc_v10_0_set_irq_funcs (adev);gmc_v10_0_set_umc_funcs (adev);@@ -775,7 +776,7 @@ static int gmc_v10_0_sw_init(void *handle)else gfxhub_v2_0_init (adev); -mmhub_v2_0_init (adev); + adev->mmhub.funcs->init (adev);spin_lock_init (&adev->gmc.invalidate_lock);@@ -944,7 +945,7 @@ static int gmc_v10_0_gart_enable(struct amdgpu_device *adev)if (r)return r; - r =mmhub_v2_0_gart_enable (adev); + r = adev->mmhub.funcs->gart_enable (adev);if (r)return r;@@ -966,7 +967,7 @@ static int gmc_v10_0_gart_enable(struct amdgpu_device *adev)gfxhub_v2_1_set_fault_enable_default (adev, value); elsegfxhub_v2_0_set_fault_enable_default (adev ,value ); -mmhub_v2_0_set_fault_enable_default (adev, value); + adev->mmhub.funcs->set_fault_enable_default (adev, value);gmc_v10_0_flush_gpu_tlb (adev,0 ,AMDGPU_MMHUB_0 ,0 );gmc_v10_0_flush_gpu_tlb (adev,0 ,AMDGPU_GFXHUB_0 ,0 );@@ -1011,7 +1012,7 @@ static void gmc_v10_0_gart_disable(struct amdgpu_device *adev)gfxhub_v2_1_gart_disable (adev); elsegfxhub_v2_0_gart_disable (adev ); -mmhub_v2_0_gart_disable (adev); + adev->mmhub.funcs->gart_disable (adev);amdgpu_gart_table_vram_unpin (adev); }@@ -1078,7 +1079,7 @@ static int gmc_v10_0_set_clockgating_state(void *handle,int r;struct amdgpu_device *adev = (struct amdgpu_device *)handle; - r =mmhub_v2_0_set_clockgating (adev, state); + r = adev->mmhub.funcs->set_clockgating (adev, state);if (r)return r;@@ -1093,7 +1094,7 @@ static void gmc_v10_0_get_clockgating_state(void *handle, u32 *flags) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -mmhub_v2_0_get_clockgating (adev, flags); + adev->mmhub.funcs->get_clockgating (adev, flags);if (adev->asic_type ==CHIP_SIENNA_CICHLID || adev->asic_type ==CHIP_NAVY_FLOUNDER )drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +13
-35@@ -908,13 +908,11 @@ static void gmc_v9_0_set_umc_funcs(struct amdgpu_device *adev)static void gmc_v9_0_set_mmhub_funcs (struct amdgpu_device *adev) {switch (adev->asic_type) { -case CHIP_VEGA20 : - adev->mmhub.funcs = &mmhub_v1_0_funcs; -break ;case CHIP_ARCTURUS : adev->mmhub.funcs = &mmhub_v9_4_funcs;break ;default : + adev->mmhub.funcs = &mmhub_v1_0_funcs;break ; } }@@ -980,10 +978,8 @@ static void gmc_v9_0_vram_gtt_location(struct amdgpu_device *adev, {u64 base =0 ; -if (adev->asic_type ==CHIP_ARCTURUS ) - base =mmhub_v9_4_get_fb_location (adev); -else if (!amdgpu_sriov_vf (adev)) - base =mmhub_v1_0_get_fb_location (adev); +if (!amdgpu_sriov_vf (adev)) + base = adev->mmhub.funcs->get_fb_location (adev);/* add the xgmi offset of the physical node */ base += adev->gmc.xgmi.physical_node_id * adev->gmc.xgmi.node_segment_size;@@ -1083,10 +1079,8 @@ static int gmc_v9_0_sw_init(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;gfxhub_v1_0_init (adev); -if (adev->asic_type ==CHIP_ARCTURUS ) -mmhub_v9_4_init (adev); -else -mmhub_v1_0_init (adev); + + adev->mmhub.funcs->init (adev);spin_lock_init (&adev->gmc.invalidate_lock);@@ -1313,10 +1307,7 @@ static int gmc_v9_0_gart_enable(struct amdgpu_device *adev)if (r)return r; -if (adev->asic_type ==CHIP_ARCTURUS ) - r =mmhub_v9_4_gart_enable (adev); -else - r =mmhub_v1_0_gart_enable (adev); + r = adev->mmhub.funcs->gart_enable (adev);if (r)return r;@@ -1351,11 +1342,10 @@ static int gmc_v9_0_hw_init(void *handle) golden_settings_vega10_hdp, ARRAY_SIZE(golden_settings_vega10_hdp)); +if (adev->mmhub.funcs->update_power_gating) + adev->mmhub.funcs->update_power_gating (adev, true); +switch (adev->asic_type) { -case CHIP_RAVEN : -/* TODO for renoir */ -mmhub_v1_0_update_power_gating (adev, true); -break ;case CHIP_ARCTURUS :WREG32_FIELD15 (HDP ,0 ,HDP_MMHUB_CNTL ,HDP_MMHUB_GCC ,1 );break ;@@ -1381,10 +1371,7 @@ static int gmc_v9_0_hw_init(void *handle)if (!amdgpu_sriov_vf (adev)) {gfxhub_v1_0_set_fault_enable_default (adev, value); -if (adev->asic_type ==CHIP_ARCTURUS ) -mmhub_v9_4_set_fault_enable_default (adev, value); -else -mmhub_v1_0_set_fault_enable_default (adev, value); + adev->mmhub.funcs->set_fault_enable_default (adev, value); }for (i =0 ; i < adev->num_vmhubs; ++i)gmc_v9_0_flush_gpu_tlb (adev,0 , i,0 );@@ -1421,10 +1408,7 @@ static void gmc_v9_0_save_registers(struct amdgpu_device *adev)static void gmc_v9_0_gart_disable (struct amdgpu_device *adev) {gfxhub_v1_0_gart_disable (adev); -if (adev->asic_type ==CHIP_ARCTURUS ) -mmhub_v9_4_gart_disable (adev); -else -mmhub_v1_0_gart_disable (adev); + adev->mmhub.funcs->gart_disable (adev);amdgpu_gart_table_vram_unpin (adev); }@@ -1497,10 +1481,7 @@ static int gmc_v9_0_set_clockgating_state(void *handle, {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -if (adev->asic_type ==CHIP_ARCTURUS ) -mmhub_v9_4_set_clockgating (adev, state); -else -mmhub_v1_0_set_clockgating (adev, state); + adev->mmhub.funcs->set_clockgating (adev, state);athub_v1_0_set_clockgating (adev, state);@@ -1511,10 +1492,7 @@ static void gmc_v9_0_get_clockgating_state(void *handle, u32 *flags) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -if (adev->asic_type ==CHIP_ARCTURUS ) -mmhub_v9_4_get_clockgating (adev, flags); -else -mmhub_v1_0_get_clockgating (adev, flags); + adev->mmhub.funcs->get_clockgating (adev, flags);athub_v1_0_get_clockgating (adev, flags); }drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +18
-9@@ -34,7 +34,7 @@#define mmDAGB0_CNTL_MISC2_RV 0x008f#define mmDAGB0_CNTL_MISC2_RV_BASE_IDX 0 -u64 mmhub_v1_0_get_fb_location (struct amdgpu_device *adev) +static u64 mmhub_v1_0_get_fb_location (struct amdgpu_device *adev) {u64 base =RREG32_SOC15 (MMHUB ,0 , mmMC_VM_FB_LOCATION_BASE);u64 top =RREG32_SOC15 (MMHUB ,0 , mmMC_VM_FB_LOCATION_TOP);@@ -51,7 +51,7 @@ u64 mmhub_v1_0_get_fb_location(struct amdgpu_device *adev)return base; } -void mmhub_v1_0_setup_vm_pt_regs (struct amdgpu_device *adev,uint32_t vmid, +static void mmhub_v1_0_setup_vm_pt_regs (struct amdgpu_device *adev,uint32_t vmid,uint64_t page_table_base) {struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0 ];@@ -297,7 +297,7 @@ static void mmhub_v1_0_program_invalidation(struct amdgpu_device *adev) } } -void mmhub_v1_0_update_power_gating (struct amdgpu_device *adev, +static void mmhub_v1_0_update_power_gating (struct amdgpu_device *adev,bool enable) {if (amdgpu_sriov_vf (adev))@@ -310,7 +310,7 @@ void mmhub_v1_0_update_power_gating(struct amdgpu_device *adev, } } -int mmhub_v1_0_gart_enable (struct amdgpu_device *adev) +static int mmhub_v1_0_gart_enable (struct amdgpu_device *adev) {if (amdgpu_sriov_vf (adev)) {/* @@ -338,7 +338,7 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev)return 0 ; } -void mmhub_v1_0_gart_disable (struct amdgpu_device *adev) +static void mmhub_v1_0_gart_disable (struct amdgpu_device *adev) {struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0 ];u32 tmp;@@ -373,7 +373,7 @@ void mmhub_v1_0_gart_disable(struct amdgpu_device *adev)* @adev: amdgpu_device pointer * @value: true redirects VM faults to the default page */ -void mmhub_v1_0_set_fault_enable_default (struct amdgpu_device *adev,bool value) +static void mmhub_v1_0_set_fault_enable_default (struct amdgpu_device *adev,bool value) {u32 tmp;@@ -415,7 +415,7 @@ void mmhub_v1_0_set_fault_enable_default(struct amdgpu_device *adev, bool value)WREG32_SOC15 (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL, tmp); } -void mmhub_v1_0_init (struct amdgpu_device *adev) +static void mmhub_v1_0_init (struct amdgpu_device *adev) {struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0 ];@@ -525,7 +525,7 @@ static void mmhub_v1_0_update_medium_grain_light_sleep(struct amdgpu_device *adeWREG32_SOC15 (MMHUB ,0 , mmATC_L2_MISC_CG, data); } -int mmhub_v1_0_set_clockgating (struct amdgpu_device *adev, +static int mmhub_v1_0_set_clockgating (struct amdgpu_device *adev,enum amd_clockgating_state state) {if (amdgpu_sriov_vf (adev))@@ -549,7 +549,7 @@ int mmhub_v1_0_set_clockgating(struct amdgpu_device *adev,return 0 ; } -void mmhub_v1_0_get_clockgating (struct amdgpu_device *adev,u32 *flags) +static void mmhub_v1_0_get_clockgating (struct amdgpu_device *adev,u32 *flags) {int data, data1;@@ -781,4 +781,13 @@ const struct amdgpu_mmhub_funcs mmhub_v1_0_funcs = { .ras_late_init = amdgpu_mmhub_ras_late_init, .query_ras_error_count = mmhub_v1_0_query_ras_error_count, .reset_ras_error_count = mmhub_v1_0_reset_ras_error_count, + .get_fb_location = mmhub_v1_0_get_fb_location, + .init = mmhub_v1_0_init, + .gart_enable = mmhub_v1_0_gart_enable, + .set_fault_enable_default = mmhub_v1_0_set_fault_enable_default, + .gart_disable = mmhub_v1_0_gart_disable, + .set_clockgating = mmhub_v1_0_set_clockgating, + .get_clockgating = mmhub_v1_0_get_clockgating, + .setup_vm_pt_regs = mmhub_v1_0_setup_vm_pt_regs, + .update_power_gating = mmhub_v1_0_update_power_gating, };drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h +0
-14@@ -25,18 +25,4 @@extern const struct amdgpu_mmhub_funcs mmhub_v1_0_funcs; -u64 mmhub_v1_0_get_fb_location (struct amdgpu_device *adev); -int mmhub_v1_0_gart_enable (struct amdgpu_device *adev); -void mmhub_v1_0_gart_disable (struct amdgpu_device *adev); -void mmhub_v1_0_set_fault_enable_default (struct amdgpu_device *adev, -bool value); -void mmhub_v1_0_init (struct amdgpu_device *adev); -int mmhub_v1_0_set_clockgating (struct amdgpu_device *adev, -enum amd_clockgating_state state); -void mmhub_v1_0_get_clockgating (struct amdgpu_device *adev,u32 *flags); -void mmhub_v1_0_update_power_gating (struct amdgpu_device *adev, -bool enable); -void mmhub_v1_0_setup_vm_pt_regs (struct amdgpu_device *adev,uint32_t vmid, -uint64_t page_table_base); -#endif drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c +18
-7@@ -83,7 +83,7 @@ mmhub_v2_0_print_l2_protection_fault_status(struct amdgpu_device *adev, MMVM_L2_PROTECTION_FAULT_STATUS, RW)); } -void mmhub_v2_0_setup_vm_pt_regs (struct amdgpu_device *adev,uint32_t vmid, +static void mmhub_v2_0_setup_vm_pt_regs (struct amdgpu_device *adev,uint32_t vmid,uint64_t page_table_base) {struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0 ];@@ -327,7 +327,7 @@ static void mmhub_v2_0_program_invalidation(struct amdgpu_device *adev) } } -int mmhub_v2_0_gart_enable (struct amdgpu_device *adev) +static int mmhub_v2_0_gart_enable (struct amdgpu_device *adev) {/* GART Enable. */ mmhub_v2_0_init_gart_aperture_regs (adev);@@ -343,7 +343,7 @@ int mmhub_v2_0_gart_enable(struct amdgpu_device *adev)return 0 ; } -void mmhub_v2_0_gart_disable (struct amdgpu_device *adev) +static void mmhub_v2_0_gart_disable (struct amdgpu_device *adev) {struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0 ];u32 tmp;@@ -374,7 +374,7 @@ void mmhub_v2_0_gart_disable(struct amdgpu_device *adev)* @adev: amdgpu_device pointer * @value: true redirects VM faults to the default page */ -void mmhub_v2_0_set_fault_enable_default (struct amdgpu_device *adev,bool value) +static void mmhub_v2_0_set_fault_enable_default (struct amdgpu_device *adev,bool value) {u32 tmp;@@ -422,7 +422,7 @@ static const struct amdgpu_vmhub_funcs mmhub_v2_0_vmhub_funcs = { .get_invalidate_req = mmhub_v2_0_get_invalidate_req, }; -void mmhub_v2_0_init (struct amdgpu_device *adev) +static void mmhub_v2_0_init (struct amdgpu_device *adev) {struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0 ];@@ -552,7 +552,7 @@ static void mmhub_v2_0_update_medium_grain_light_sleep(struct amdgpu_device *ade } } -int mmhub_v2_0_set_clockgating (struct amdgpu_device *adev, +static int mmhub_v2_0_set_clockgating (struct amdgpu_device *adev,enum amd_clockgating_state state) {if (amdgpu_sriov_vf (adev))@@ -576,7 +576,7 @@ int mmhub_v2_0_set_clockgating(struct amdgpu_device *adev,return 0 ; } -void mmhub_v2_0_get_clockgating (struct amdgpu_device *adev,u32 *flags) +static void mmhub_v2_0_get_clockgating (struct amdgpu_device *adev,u32 *flags) {int data, data1;@@ -609,3 +609,14 @@ void mmhub_v2_0_get_clockgating(struct amdgpu_device *adev, u32 *flags)if (data &MM_ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK ) *flags |=AMD_CG_SUPPORT_MC_LS ; } + +const struct amdgpu_mmhub_funcs mmhub_v2_0_funcs = { + .ras_late_init = amdgpu_mmhub_ras_late_init, + .init = mmhub_v2_0_init, + .gart_enable = mmhub_v2_0_gart_enable, + .set_fault_enable_default = mmhub_v2_0_set_fault_enable_default, + .gart_disable = mmhub_v2_0_gart_disable, + .set_clockgating = mmhub_v2_0_set_clockgating, + .get_clockgating = mmhub_v2_0_get_clockgating, + .setup_vm_pt_regs = mmhub_v2_0_setup_vm_pt_regs, +};drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.h +1
-10@@ -23,15 +23,6 @@#ifndef __MMHUB_V2_0_H__#define __MMHUB_V2_0_H__ -int mmhub_v2_0_gart_enable (struct amdgpu_device *adev); -void mmhub_v2_0_gart_disable (struct amdgpu_device *adev); -void mmhub_v2_0_set_fault_enable_default (struct amdgpu_device *adev, -bool value); -void mmhub_v2_0_init (struct amdgpu_device *adev); -int mmhub_v2_0_set_clockgating (struct amdgpu_device *adev, -enum amd_clockgating_state state); -void mmhub_v2_0_get_clockgating (struct amdgpu_device *adev,u32 *flags); -void mmhub_v2_0_setup_vm_pt_regs (struct amdgpu_device *adev,uint32_t vmid, -uint64_t page_table_base); +extern const struct amdgpu_mmhub_funcs mmhub_v2_0_funcs;#endif drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c +16
-8@@ -36,7 +36,7 @@#define MMHUB_NUM_INSTANCES 2#define MMHUB_INSTANCE_REGISTER_OFFSET 0x3000 -u64 mmhub_v9_4_get_fb_location (struct amdgpu_device *adev) +static u64 mmhub_v9_4_get_fb_location (struct amdgpu_device *adev) {/* The base should be same b/t 2 mmhubs on Acrturus. Read one here. */ u64 base =RREG32_SOC15 (MMHUB ,0 , mmVMSHAREDVC0_MC_VM_FB_LOCATION_BASE);@@ -97,7 +97,7 @@ static void mmhub_v9_4_init_gart_aperture_regs(struct amdgpu_device *adev, (u32)(adev->gmc.gart_end >> 44)); } -void mmhub_v9_4_setup_vm_pt_regs (struct amdgpu_device *adev,uint32_t vmid, +static void mmhub_v9_4_setup_vm_pt_regs (struct amdgpu_device *adev,uint32_t vmid,uint64_t page_table_base) {int i;@@ -375,7 +375,7 @@ static void mmhub_v9_4_program_invalidation(struct amdgpu_device *adev, } } -int mmhub_v9_4_gart_enable (struct amdgpu_device *adev) +static int mmhub_v9_4_gart_enable (struct amdgpu_device *adev) {int i;@@ -397,7 +397,7 @@ int mmhub_v9_4_gart_enable(struct amdgpu_device *adev)return 0 ; } -void mmhub_v9_4_gart_disable (struct amdgpu_device *adev) +static void mmhub_v9_4_gart_disable (struct amdgpu_device *adev) {struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0 ];u32 tmp;@@ -442,7 +442,7 @@ void mmhub_v9_4_gart_disable(struct amdgpu_device *adev)* @adev: amdgpu_device pointer * @value: true redirects VM faults to the default page */ -void mmhub_v9_4_set_fault_enable_default (struct amdgpu_device *adev,bool value) +static void mmhub_v9_4_set_fault_enable_default (struct amdgpu_device *adev,bool value) {u32 tmp;int i;@@ -500,7 +500,7 @@ void mmhub_v9_4_set_fault_enable_default(struct amdgpu_device *adev, bool value) } } -void mmhub_v9_4_init (struct amdgpu_device *adev) +static void mmhub_v9_4_init (struct amdgpu_device *adev) {struct amdgpu_vmhub *hub[MMHUB_NUM_INSTANCES ] = {&adev->vmhub[AMDGPU_MMHUB_0 ], &adev->vmhub[AMDGPU_MMHUB_1 ]};@@ -630,7 +630,7 @@ static void mmhub_v9_4_update_medium_grain_light_sleep(struct amdgpu_device *ade } } -int mmhub_v9_4_set_clockgating (struct amdgpu_device *adev, +static int mmhub_v9_4_set_clockgating (struct amdgpu_device *adev,enum amd_clockgating_state state) {if (amdgpu_sriov_vf (adev))@@ -650,7 +650,7 @@ int mmhub_v9_4_set_clockgating(struct amdgpu_device *adev,return 0 ; } -void mmhub_v9_4_get_clockgating (struct amdgpu_device *adev,u32 *flags) +static void mmhub_v9_4_get_clockgating (struct amdgpu_device *adev,u32 *flags) {int data, data1;@@ -1628,4 +1628,12 @@ const struct amdgpu_mmhub_funcs mmhub_v9_4_funcs = { .ras_late_init = amdgpu_mmhub_ras_late_init, .query_ras_error_count = mmhub_v9_4_query_ras_error_count, .reset_ras_error_count = mmhub_v9_4_reset_ras_error_count, + .get_fb_location = mmhub_v9_4_get_fb_location, + .init = mmhub_v9_4_init, + .gart_enable = mmhub_v9_4_gart_enable, + .set_fault_enable_default = mmhub_v9_4_set_fault_enable_default, + .gart_disable = mmhub_v9_4_gart_disable, + .set_clockgating = mmhub_v9_4_set_clockgating, + .get_clockgating = mmhub_v9_4_get_clockgating, + .setup_vm_pt_regs = mmhub_v9_4_setup_vm_pt_regs, };drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h +0
-13@@ -25,16 +25,4 @@extern const struct amdgpu_mmhub_funcs mmhub_v9_4_funcs; -u64 mmhub_v9_4_get_fb_location (struct amdgpu_device *adev); -int mmhub_v9_4_gart_enable (struct amdgpu_device *adev); -void mmhub_v9_4_gart_disable (struct amdgpu_device *adev); -void mmhub_v9_4_set_fault_enable_default (struct amdgpu_device *adev, -bool value); -void mmhub_v9_4_init (struct amdgpu_device *adev); -int mmhub_v9_4_set_clockgating (struct amdgpu_device *adev, -enum amd_clockgating_state state); -void mmhub_v9_4_get_clockgating (struct amdgpu_device *adev,u32 *flags); -void mmhub_v9_4_setup_vm_pt_regs (struct amdgpu_device *adev,uint32_t vmid, -uint64_t page_table_base); -#endif --2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Zeng, Oak
Reviewed-by Alex Deucher[AMD Official Use Only - Internal Distribution Only]
Alex, Yes I saw the same clean up for gfxhub. Will do it when I get a chance.
Regards,
Oak
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Tuesday, August 11, 2020 2:56 PM
To: Zeng, Oak <[email protected]>
Cc: amd-gfx list <[email protected]>; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH] drm/amdgpu: Use function pointer for some mmhub functions
Quoted 130 lines · Oak Zeng
Add more function pointers to
amdgpu_mmhub_funcs. ASIC specific implementation of most mmhub functions are called from a general function pointer, instead of calling different function for different ASIC. Simplify the code by deleting duplicate functionsChange-Id I65ba660c69b74c7e779190c4f92e9d7138f7c7d4Signed-off-by Oak Zeng <[email protected]>--- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 21 ++-------- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 3 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 13 ++++++ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 13 +++--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 48 ++++++---------------- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 27 ++++++++---- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 14 ------- drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 25 +++++++---- drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.h | 11 +---- drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 24 +++++++---- drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 12 ------ 12 files changed, 94 insertions(+), 121 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c +4
-18@@ -284,22 +284,6 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd,return 0 ; } -static void kgd_set_vm_context_page_table_base (struct kgd_dev *kgd,uint32_t vmid, -uint64_t page_table_base) -{ -struct amdgpu_device *adev =get_amdgpu_device (kgd); - -if (!amdgpu_amdkfd_is_kfd_vmid (adev, vmid)) { -pr_err ("trying to set page table base for wrong VMID %u\n" , - vmid); -return ; - } - -mmhub_v9_4_setup_vm_pt_regs (adev, vmid, page_table_base); - -gfxhub_v1_0_setup_vm_pt_regs (adev, vmid, page_table_base); -} -const struct kfd2kgd_calls arcturus_kfd2kgd = { .program_sh_mem_settings = kgd_gfx_v9_program_sh_mem_settings, .set_pasid_vmid_mapping = kgd_gfx_v9_set_pasid_vmid_mapping,@@ -318,7 +302,8 @@ const struct kfd2kgd_calls arcturus_kfd2kgd = { .wave_control_execute = kgd_gfx_v9_wave_control_execute, .address_watch_get_offset = kgd_gfx_v9_address_watch_get_offset, .get_atc_vmid_pasid_mapping_info = - kgd_gfx_v9_get_atc_vmid_pasid_mapping_info, - .set_vm_context_page_table_base = kgd_set_vm_context_page_table_base, + kgd_gfx_v9_get_atc_vmid_pasid_mapping_info, + .set_vm_context_page_table_base = + + kgd_gfx_v9_set_vm_context_page_table_base, .get_hive_id = amdgpu_amdkfd_get_hive_id, }; diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.cb/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.cindex 032d3c8..7e11625 100644drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +4
-2@@ -679,7 +679,7 @@ uint32_t kgd_gfx_v9_address_watch_get_offset(struct kgd_dev *kgd,return 0 ; } -static void kgd_gfx_v9_set_vm_context_page_table_base (struct kgd_dev *kgd, +void kgd_gfx_v9_set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid, uint64_t page_table_base) { struct amdgpu_device *adev = get_amdgpu_device(kgd); @@ -690,7 +690,7 @@ static void kgd_gfx_v9_set_vm_context_page_table_base(struct kgd_dev *kgd, return; } -mmhub_v1_0_setup_vm_pt_regs (adev, vmid, page_table_base); + adev->mmhub.funcs->setup_vm_pt_regs (adev, vmid, + page_table_base);gfxhub_v1_0_setup_vm_pt_regs (adev, vmid, page_table_base); }drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h +0
-0@@ -60,3 +60,6 @@ uint32_t kgd_gfx_v9_address_watch_get_offset(structkgd_dev *kgd, bool kgd_gfx_v9_get_atc_vmid_pasid_mapping_info(struct kgd_dev *kgd, uint8_t vmid, uint16_t
*p_pasid);drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h +3
-0+ +void kgd_gfx_v9_set_vm_context_page_table_base (struct kgd_dev *kgd, +uint32_t vmid,uint64_t page_table_base);drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h +13
-0@@ -27,6 +27,19 @@ struct amdgpu_mmhub_funcs {void (*query_ras_error_count)(struct amdgpu_device *adev,void *ras_error_status);void (*reset_ras_error_count)(struct amdgpu_device *adev); +u64 (*get_fb_location)(struct amdgpu_device *adev); +void (*init)(struct amdgpu_device *adev); +int (*gart_enable)(struct amdgpu_device *adev); +void (*set_fault_enable_default)(struct amdgpu_device *adev, +bool value); +void (*gart_disable)(struct amdgpu_device *adev); +int (*set_clockgating)(struct amdgpu_device *adev, +enum amd_clockgating_state state); +void (*get_clockgating)(struct amdgpu_device *adev,u32 *flags); +void (*setup_vm_pt_regs)(struct amdgpu_device *adev,uint32_t vmid, +uint64_t page_table_base); +void (*update_power_gating)(struct amdgpu_device *adev, +bool enable); };struct amdgpu_mmhub {drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +0
-0
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c static int gmc_v10_0_early_init(void *handle) { · line 633
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +1
-0@@ -631,6 +631,7 @@ static int gmc_v10_0_early_init(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; + adev->mmhub.funcs = &mmhub_v2_0_funcs;
Maybe add a gmc_v10_set_mmhub_funcs() function for consistency with other families? With that fixed:
Also, it looks like gfxhub could use a similar clean up. Care to take a look at that as well?
Thanks,
Alex
Quoted 529 lines
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +0
-0gmc_v10_0_set_gmc_funcs (adev);gmc_v10_0_set_irq_funcs (adev); gmc_v10_0_set_umc_funcs(adev); @@ -775,7 +776,7 @@ static intgmc_v10_0_sw_init (void *handle)else gfxhub_v2_0_init(adev);drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +6
-6-mmhub_v2_0_init (adev); + adev->mmhub.funcs->init (adev);spin_lock_init (&adev->gmc.invalidate_lock);@@ -944,7 +945,7 @@ static int gmc_v10_0_gart_enable(struct amdgpu_device *adev)if (r)return r; - r =mmhub_v2_0_gart_enable (adev); + r = adev->mmhub.funcs->gart_enable (adev);if (r)return r;@@ -966,7 +967,7 @@ static int gmc_v10_0_gart_enable(struct amdgpu_device *adev)gfxhub_v2_1_set_fault_enable_default (adev, value); elsegfxhub_v2_0_set_fault_enable_default (adev ,value ); -mmhub_v2_0_set_fault_enable_default (adev, value); + adev->mmhub.funcs->set_fault_enable_default (adev, value);gmc_v10_0_flush_gpu_tlb (adev,0 ,AMDGPU_MMHUB_0 ,0 );gmc_v10_0_flush_gpu_tlb (adev,0 ,AMDGPU_GFXHUB_0 ,0 );@@ -1011,7 +1012,7 @@ static void gmc_v10_0_gart_disable(struct amdgpu_device *adev)gfxhub_v2_1_gart_disable (adev); elsegfxhub_v2_0_gart_disable (adev ); -mmhub_v2_0_gart_disable (adev); + adev->mmhub.funcs->gart_disable (adev);amdgpu_gart_table_vram_unpin (adev); }@@ -1078,7 +1079,7 @@ static int gmc_v10_0_set_clockgating_state(void *handle,int r;struct amdgpu_device *adev = (struct amdgpu_device *)handle; - r =mmhub_v2_0_set_clockgating (adev, state); + r = adev->mmhub.funcs->set_clockgating (adev, state);if (r)return r;@@ -1093,7 +1094,7 @@ static void gmc_v10_0_get_clockgating_state(void *handle, u32 *flags) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -mmhub_v2_0_get_clockgating (adev, flags); + adev->mmhub.funcs->get_clockgating (adev, flags);if (adev->asic_type ==CHIP_SIENNA_CICHLID || adev->asic_type == CHIP_NAVY_FLOUNDER) diff --git
a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.cb/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 65488dd..773ee11 100644drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +0
-0@@ -908,13 +908,11 @@ static void gmc_v9_0_set_umc_funcs(struct
amdgpu_device*adev) static void gmc_v9_0_set_mmhub_funcs(structamdgpu_device *adev) { switch (adev->asic_type) {drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +3
-7-case CHIP_VEGA20 : - adev->mmhub.funcs = &mmhub_v1_0_funcs; -break ;case CHIP_ARCTURUS : adev->mmhub.funcs = &mmhub_v9_4_funcs;break ;default : + adev->mmhub.funcs = &mmhub_v1_0_funcs;break ; } }@@ -980,10 +978,8 @@ static void gmc_v9_0_vram_gtt_location(struct amdgpu_device *adev, {u64 base =0 ; -if (adev->asic_type ==CHIP_ARCTURUS ) - base =mmhub_v9_4_get_fb_location (adev); -else if (!amdgpu_sriov_vf (adev)) - base =mmhub_v1_0_get_fb_location (adev); +if (!amdgpu_sriov_vf (adev)) + base = adev->mmhub.funcs->get_fb_location (adev);/* add the xgmi offset of the physical node */ base += adev->gmc.xgmi.physical_node_id *
adev->gmc.xgmi.node_segment_size; @@ -1083,10 +1079,8 @@ static intgmc_v9_0_sw_init(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle; gfxhub_v1_0_init(adev);drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +6
-12-if (adev->asic_type ==CHIP_ARCTURUS ) -mmhub_v9_4_init (adev); -else -mmhub_v1_0_init (adev); + + adev->mmhub.funcs->init (adev);spin_lock_init (&adev->gmc.invalidate_lock);@@ -1313,10 +1307,7 @@ static int gmc_v9_0_gart_enable(struct amdgpu_device *adev)if (r)return r; -if (adev->asic_type ==CHIP_ARCTURUS ) - r =mmhub_v9_4_gart_enable (adev); -else - r =mmhub_v1_0_gart_enable (adev); + r = adev->mmhub.funcs->gart_enable (adev);if (r)return r;@@ -1351,11 +1342,10 @@ static int gmc_v9_0_hw_init(void *handle) golden_settings_vega10_hdp, ARRAY_SIZE(golden_settings_vega10_hdp)); +if (adev->mmhub.funcs->update_power_gating) + adev->mmhub.funcs->update_power_gating (adev, true); +switch (adev->asic_type) { -case CHIP_RAVEN : -/* TODO for renoir */ -mmhub_v1_0_update_power_gating (adev, true); -break ;case CHIP_ARCTURUS :WREG32_FIELD15 (HDP ,0 ,HDP_MMHUB_CNTL ,HDP_MMHUB_GCC ,1 );break;drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +3
-4@@ -1381,10 +1371,7 @@ static int gmc_v9_0_hw_init(void *handle)if (!amdgpu_sriov_vf (adev)) {gfxhub_v1_0_set_fault_enable_default (adev, value); -if (adev->asic_type ==CHIP_ARCTURUS ) -mmhub_v9_4_set_fault_enable_default (adev, value); -else -mmhub_v1_0_set_fault_enable_default (adev, value); + adev->mmhub.funcs->set_fault_enable_default (adev, + value); }for (i =0 ; i < adev->num_vmhubs; ++i) gmc_v9_0_flush_gpu_tlb(adev, 0, i, 0); @@ -1421,10 +1408,7 @@ static void gmc_v9_0_save_registers(struct amdgpu_device*adev) static void
gmc_v9_0_gart_disable(struct amdgpu_device *adev){ gfxhub_v1_0_gart_disable(adev);drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +3
-12-if (adev->asic_type ==CHIP_ARCTURUS ) -mmhub_v9_4_gart_disable (adev); -else -mmhub_v1_0_gart_disable (adev); + adev->mmhub.funcs->gart_disable (adev);amdgpu_gart_table_vram_unpin (adev); }@@ -1497,10 +1481,7 @@ static int gmc_v9_0_set_clockgating_state(void *handle, {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -if (adev->asic_type ==CHIP_ARCTURUS ) -mmhub_v9_4_set_clockgating (adev, state); -else -mmhub_v1_0_set_clockgating (adev, state); + adev->mmhub.funcs->set_clockgating (adev, state);athub_v1_0_set_clockgating (adev, state);@@ -1511,10 +1492,7 @@ static void gmc_v9_0_get_clockgating_state(void *handle, u32 *flags) { struct amdgpu_device *adev = (struct amdgpu_device *)handle; -if (adev->asic_type ==CHIP_ARCTURUS ) -mmhub_v9_4_get_clockgating (adev, flags); -else -mmhub_v1_0_get_clockgating (adev, flags); + adev->mmhub.funcs->get_clockgating(adev, flags); athub_v1_0_get_clockgating(adev, flags); } diff --git
a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.cb/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
index dffcb93..e24d6e5 100755drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +1
-3@@ -34,7 +34,7 @@#define mmDAGB0_CNTL_MISC2_RV 0x008f#define mmDAGB0_CNTL_MISC2_RV_BASE_IDX 0 -u64 mmhub_v1_0_get_fb_location (struct amdgpu_device *adev) +static u64 mmhub_v1_0_get_fb_location (struct amdgpu_device *adev) {u64 base =RREG32_SOC15 (MMHUB ,0 , mmMC_VM_FB_LOCATION_BASE); u64 top = RREG32_SOC15(MMHUB, 0, mmMC_VM_FB_LOCATION_TOP); @@ -51,7 +51,7 @@ u64 mmhub_v1_0_get_fb_location(struct amdgpu_device *adev)return base; } -void mmhub_v1_0_setup_vm_pt_regs(struct amdgpu_device *adev, uint32_tvmid,
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +21
-8+static void mmhub_v1_0_setup_vm_pt_regs (struct amdgpu_device *adev, +uint32_t vmid,uint64_t page_table_base) { struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0]; @@ -297,7 +297,7 @@ static void mmhub_v1_0_program_invalidation(struct amdgpu_device *adev) } } -void mmhub_v1_0_update_power_gating (struct amdgpu_device *adev, +static void mmhub_v1_0_update_power_gating (struct amdgpu_device +*adev,bool enable) {if (amdgpu_sriov_vf (adev))@@ -310,7 +310,7 @@ void mmhub_v1_0_update_power_gating(struct amdgpu_device *adev, } } -int mmhub_v1_0_gart_enable (struct amdgpu_device *adev) +static int mmhub_v1_0_gart_enable (struct amdgpu_device *adev) {if (amdgpu_sriov_vf (adev)) {/* @@ -338,7 +338,7 @@ int mmhub_v1_0_gart_enable(struct amdgpu_device *adev)return 0 ; } -void mmhub_v1_0_gart_disable (struct amdgpu_device *adev) +static void mmhub_v1_0_gart_disable (struct amdgpu_device *adev) {struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0 ];u32 tmp;@@ -373,7 +373,7 @@ void mmhub_v1_0_gart_disable(struct amdgpu_device *adev)* @adev: amdgpu_device pointer * @value: true redirects VM faults to the default page */ -void mmhub_v1_0_set_fault_enable_default (struct amdgpu_device *adev, bool value) +static void mmhub_v1_0_set_fault_enable_default (struct amdgpu_device +*adev,bool value) {u32 tmp;@@ -415,7 +415,7 @@ void mmhub_v1_0_set_fault_enable_default(struct amdgpu_device *adev, bool value)WREG32_SOC15 (MMHUB ,0 , mmVM_L2_PROTECTION_FAULT_CNTL, tmp); } -void mmhub_v1_0_init (struct amdgpu_device *adev) +static void mmhub_v1_0_init (struct amdgpu_device *adev) {struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0 ];@@ -525,7 +525,7 @@ static void mmhub_v1_0_update_medium_grain_light_sleep(struct amdgpu_device *adeWREG32_SOC15 (MMHUB ,0 , mmATC_L2_MISC_CG, data); } -int mmhub_v1_0_set_clockgating (struct amdgpu_device *adev, +static int mmhub_v1_0_set_clockgating (struct amdgpu_device *adev,enum amd_clockgating_state state) {if (amdgpu_sriov_vf (adev))@@ -549,7 +549,7 @@ int mmhub_v1_0_set_clockgating(struct amdgpu_device *adev,return 0 ; } -void mmhub_v1_0_get_clockgating (struct amdgpu_device *adev,u32 *flags) +static void mmhub_v1_0_get_clockgating (struct amdgpu_device *adev, +u32 *flags) {int data, data1;@@ -781,4 +781,13 @@ const struct amdgpu_mmhub_funcs mmhub_v1_0_funcs = { .ras_late_init = amdgpu_mmhub_ras_late_init, .query_ras_error_count = mmhub_v1_0_query_ras_error_count, .reset_ras_error_count = mmhub_v1_0_reset_ras_error_count, + .get_fb_location = mmhub_v1_0_get_fb_location, + .init = mmhub_v1_0_init, + .gart_enable = mmhub_v1_0_gart_enable, + .set_fault_enable_default = mmhub_v1_0_set_fault_enable_default, + .gart_disable = mmhub_v1_0_gart_disable, + .set_clockgating = mmhub_v1_0_set_clockgating, + .get_clockgating = mmhub_v1_0_get_clockgating, + .setup_vm_pt_regs = mmhub_v1_0_setup_vm_pt_regs, + .update_power_gating = mmhub_v1_0_update_power_gating, };drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h +0
-1@@ -25,18 +25,4 @@extern const struct amdgpu_mmhub_funcs mmhub_v1_0_funcs; -u64 mmhub_v1_0_get_fb_location (struct amdgpu_device *adev); -int
mmhub_v1_0_gart_enable(struct amdgpu_device *adev); -voidmmhub_v1_0_gart_disable(struct amdgpu_device *adev); -void mmhub_v1_0_set_fault_enable_default(structamdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h +0
-2- bool value); -void mmhub_v1_0_init (struct amdgpu_device *adev); -intmmhub_v1_0_set_clockgating(struct
amdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h +0
-2- enum amd_clockgating_state state); -void mmhub_v1_0_get_clockgating(struct amdgpu_device *adev, u32*flags); -void mmhub_v1_0_update_power_gating(struct
amdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h +0
-4- bool enable); -void mmhub_v1_0_setup_vm_pt_regs (struct amdgpu_device *adev,uint32_t vmid, -uint64_t page_table_base); -#endif drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c +2
-2@@ -83,7 +83,7 @@ mmhub_v2_0_print_l2_protection_fault_status(struct amdgpu_device *adev, MMVM_L2_PROTECTION_FAULT_STATUS, RW)); } -void mmhub_v2_0_setup_vm_pt_regs (struct amdgpu_device *adev,uint32_t vmid, +static void mmhub_v2_0_setup_vm_pt_regs(struct amdgpu_device *adev, +uint32_t vmid,uint64_t page_table_base) { struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0]; @@ -327,7 +327,7 @@ static void mmhub_v2_0_program_invalidation(struct amdgpu_device *adev)}}
drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c +18
-6-int mmhub_v2_0_gart_enable (struct amdgpu_device *adev) +static int mmhub_v2_0_gart_enable (struct amdgpu_device *adev) {/* GART Enable. */ mmhub_v2_0_init_gart_aperture_regs (adev);@@ -343,7 +343,7 @@ int mmhub_v2_0_gart_enable(struct amdgpu_device *adev)return 0 ; } -void mmhub_v2_0_gart_disable (struct amdgpu_device *adev) +static void mmhub_v2_0_gart_disable (struct amdgpu_device *adev) {struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0 ];u32 tmp;@@ -374,7 +374,7 @@ void mmhub_v2_0_gart_disable(struct amdgpu_device *adev)* @adev: amdgpu_device pointer * @value: true redirects VM faults to the default page */ -void mmhub_v2_0_set_fault_enable_default (struct amdgpu_device *adev, bool value) +static void mmhub_v2_0_set_fault_enable_default (struct amdgpu_device +*adev,bool value) {u32 tmp;@@ -422,7 +422,7 @@ static const struct amdgpu_vmhub_funcs mmhub_v2_0_vmhub_funcs = { .get_invalidate_req = mmhub_v2_0_get_invalidate_req, }; -void mmhub_v2_0_init (struct amdgpu_device *adev) +static void mmhub_v2_0_init (struct amdgpu_device *adev) {struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0 ];@@ -552,7 +552,7 @@ static void mmhub_v2_0_update_medium_grain_light_sleep(struct amdgpu_device *ade } } -int mmhub_v2_0_set_clockgating (struct amdgpu_device *adev, +static int mmhub_v2_0_set_clockgating (struct amdgpu_device *adev,enum amd_clockgating_state state) {if (amdgpu_sriov_vf (adev))@@ -576,7 +576,7 @@ int mmhub_v2_0_set_clockgating(struct amdgpu_device *adev,return 0 ; } -void mmhub_v2_0_get_clockgating (struct amdgpu_device *adev,u32 *flags) +static void mmhub_v2_0_get_clockgating (struct amdgpu_device *adev, +u32 *flags) {int data, data1;@@ -609,3 +609,14 @@ void mmhub_v2_0_get_clockgating(struct amdgpu_device *adev, u32 *flags)if (data &MM_ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK ) *flags |=AMD_CG_SUPPORT_MC_LS ; } + +const struct amdgpu_mmhub_funcs mmhub_v2_0_funcs = { + .ras_late_init = amdgpu_mmhub_ras_late_init, + .init = mmhub_v2_0_init, + .gart_enable = mmhub_v2_0_gart_enable, + .set_fault_enable_default = mmhub_v2_0_set_fault_enable_default, + .gart_disable = mmhub_v2_0_gart_disable, + .set_clockgating = mmhub_v2_0_set_clockgating, + .get_clockgating = mmhub_v2_0_get_clockgating, + .setup_vm_pt_regs = mmhub_v2_0_setup_vm_pt_regs, };drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.h +0
-1@@ -23,15 +23,6 @@#ifndef __MMHUB_V2_0_H__#define __MMHUB_V2_0_H__ -int mmhub_v2_0_gart_enable (struct amdgpu_device *adev); -void
mmhub_v2_0_gart_disable(struct amdgpu_device *adev); -void mmhub_v2_0_set_fault_enable_default(structamdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.h +0
-2- bool value); -void mmhub_v2_0_init (struct amdgpu_device *adev); -intmmhub_v2_0_set_clockgating(struct
amdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.h +0
-2- enum amd_clockgating_state state); -void mmhub_v2_0_get_clockgating(struct amdgpu_device *adev, u32*flags); -void mmhub_v2_0_setup_vm_pt_regs(struct
amdgpu_device*adev,uint32_tvmid,drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.h +1
-1- uint64_t page_table_base); +extern const struct amdgpu_mmhub_funcs mmhub_v2_0_funcs;#endif drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c +1
-1@@ -36,7 +36,7 @@#define MMHUB_NUM_INSTANCES 2#define MMHUB_INSTANCE_REGISTER_OFFSET 0x3000 -u64 mmhub_v9_4_get_fb_location (struct amdgpu_device *adev) +static u64 mmhub_v9_4_get_fb_location (struct amdgpu_device *adev) {/* The base should be same b/t 2 mmhubs on Acrturus. Read one here. */ u64 base = RREG32_SOC15(MMHUB, 0,
mmVMSHAREDVC0_MC_VM_FB_LOCATION_BASE);drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c +7
-5@@ -97,7 +97,7 @@ static void mmhub_v9_4_init_gart_aperture_regs(struct amdgpu_device *adev, (u32)(adev->gmc.gart_end >> 44)); } -void mmhub_v9_4_setup_vm_pt_regs (struct amdgpu_device *adev,uint32_t vmid, +static void mmhub_v9_4_setup_vm_pt_regs(struct amdgpu_device *adev, +uint32_t vmid,uint64_t page_table_base) {int i;@@ -375,7 +375,7 @@ static void mmhub_v9_4_program_invalidation(struct amdgpu_device *adev, } } -int mmhub_v9_4_gart_enable (struct amdgpu_device *adev) +static int mmhub_v9_4_gart_enable (struct amdgpu_device *adev) {int i;@@ -397,7 +397,7 @@ int mmhub_v9_4_gart_enable(struct amdgpu_device *adev)return 0 ; } -void mmhub_v9_4_gart_disable (struct amdgpu_device *adev) +static void mmhub_v9_4_gart_disable (struct amdgpu_device *adev) {struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0 ];u32 tmp;@@ -442,7 +442,7 @@ void mmhub_v9_4_gart_disable(struct amdgpu_device *adev)* @adev: amdgpu_device pointer * @value: true redirects VM faults to the default page */ -void mmhub_v9_4_set_fault_enable_default (struct amdgpu_device *adev, bool value) +static void mmhub_v9_4_set_fault_enable_default (struct amdgpu_device +*adev,bool value) {u32 tmp;int i;@@ -500,7 +500,7 @@ void mmhub_v9_4_set_fault_enable_default(struct amdgpu_device *adev, bool value) } } -void mmhub_v9_4_init (struct amdgpu_device *adev) +static void mmhub_v9_4_init (struct amdgpu_device *adev) {struct amdgpu_vmhub *hub[MMHUB_NUM_INSTANCES ] = {&adev->vmhub[AMDGPU_MMHUB_0 ],&adev->vmhub[AMDGPU_MMHUB_1]}; @@ -630,7 +630,7 @@ static void mmhub_v9_4_update_medium_grain_light_sleep(struct
amdgpu_device*ade}}
drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c +11
-2-int mmhub_v9_4_set_clockgating (struct amdgpu_device *adev, +static int mmhub_v9_4_set_clockgating (struct amdgpu_device *adev,enum amd_clockgating_state state) {if (amdgpu_sriov_vf (adev))@@ -650,7 +650,7 @@ int mmhub_v9_4_set_clockgating(struct amdgpu_device *adev,return 0 ; } -void mmhub_v9_4_get_clockgating (struct amdgpu_device *adev,u32 *flags) +static void mmhub_v9_4_get_clockgating (struct amdgpu_device *adev, +u32 *flags) {int data, data1;@@ -1628,4 +1628,12 @@ const struct amdgpu_mmhub_funcs mmhub_v9_4_funcs = { .ras_late_init = amdgpu_mmhub_ras_late_init, .query_ras_error_count = mmhub_v9_4_query_ras_error_count, .reset_ras_error_count = mmhub_v9_4_reset_ras_error_count, + .get_fb_location = mmhub_v9_4_get_fb_location, + .init = mmhub_v9_4_init, + .gart_enable = mmhub_v9_4_gart_enable, + .set_fault_enable_default = mmhub_v9_4_set_fault_enable_default, + .gart_disable = mmhub_v9_4_gart_disable, + .set_clockgating = mmhub_v9_4_set_clockgating, + .get_clockgating = mmhub_v9_4_get_clockgating, + .setup_vm_pt_regs = mmhub_v9_4_setup_vm_pt_regs, };drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h +0
-1@@ -25,16 +25,4 @@extern const struct amdgpu_mmhub_funcs mmhub_v9_4_funcs; -u64 mmhub_v9_4_get_fb_location (struct amdgpu_device *adev); -int
mmhub_v9_4_gart_enable(struct amdgpu_device *adev); -voidmmhub_v9_4_gart_disable(struct amdgpu_device *adev); -void mmhub_v9_4_set_fault_enable_default(structamdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h +0
-2- bool value); -void mmhub_v9_4_init (struct amdgpu_device *adev); -intmmhub_v9_4_set_clockgating(struct
amdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h +0
-2- enum amd_clockgating_state state); -void mmhub_v9_4_get_clockgating(struct amdgpu_device *adev, u32*flags); -void mmhub_v9_4_setup_vm_pt_regs(struct
amdgpu_device*adev,uint32_tvmid,drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h +0
-3- uint64_t page_table_base); -#endif --2.7.4
Quoted 8 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
s.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7COa k.Zeng%40amd.com%7C3bb6298f39da48c8232508d83e282df4%7C3dd8961fe4884e60 8e11a82d994e183d%7C0%7C0%7C637327689578164149&sdata=swa5nabOEJ7bSf 8Z3Hkx6kOI%2BHGLNsPySkUyjoRCKGU%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx