Commit 9fb1506e authored by Oak Zeng's avatar Oak Zeng Committed by Alex Deucher
Browse files

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

Signed-off-by: default avatarOak Zeng <Oak.Zeng@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2f530724

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c

+3 −18
Original line number Diff line number Diff line
@@ -283,22 +283,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,6 +302,7 @@ const struct kfd2kgd_calls arcturus_kfd2kgd = { 
	.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,

	.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
Original line number Diff line number Diff line
@@ -677,7 +677,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);
@@ -688,7 +688,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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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

+13 −6
Original line number Diff line number Diff line
@@ -627,10 +627,17 @@ static void gmc_v10_0_set_umc_funcs(struct amdgpu_device *adev) 
	}

}





static void gmc_v10_0_set_mmhub_funcs(struct amdgpu_device *adev)

{

	adev->mmhub.funcs = &mmhub_v2_0_funcs;

}



static int gmc_v10_0_early_init(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	gmc_v10_0_set_mmhub_funcs(adev);

	gmc_v10_0_set_gmc_funcs(adev);

	gmc_v10_0_set_irq_funcs(adev);

	gmc_v10_0_set_umc_funcs(adev);
@@ -775,7 +782,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 +951,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 +973,7 @@ static int gmc_v10_0_gart_enable(struct amdgpu_device *adev) 
		gfxhub_v2_1_set_fault_enable_default(adev, value);

	else

		gfxhub_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 +1018,7 @@ static void gmc_v10_0_gart_disable(struct amdgpu_device *adev) 
		gfxhub_v2_1_gart_disable(adev);

	else

		gfxhub_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 +1085,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 +1100,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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE