Commit 332f6e1e authored by Felix Kuehling's avatar Felix Kuehling Committed by Alex Deucher
Browse files

drm/amdkfd: call amdgpu_amdkfd_get_hive_id directly 



No need to use a function pointer because the implementation is not
ASIC-specific.

Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 817154c1

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

+0 −1
Original line number Diff line number Diff line
@@ -304,5 +304,4 @@ const struct kfd2kgd_calls arcturus_kfd2kgd = { 
				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_v10.c

+0 −1
Original line number Diff line number Diff line
@@ -776,5 +776,4 @@ const struct kfd2kgd_calls gfx_v10_kfd2kgd = { 
	.get_atc_vmid_pasid_mapping_info =

			get_atc_vmid_pasid_mapping_info,

	.set_vm_context_page_table_base = set_vm_context_page_table_base,

	.get_hive_id = amdgpu_amdkfd_get_hive_id,

};

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

+0 −1
Original line number Diff line number Diff line
@@ -822,7 +822,6 @@ const struct kfd2kgd_calls gfx_v10_3_kfd2kgd = { 
	.address_watch_get_offset = address_watch_get_offset_v10_3,

	.get_atc_vmid_pasid_mapping_info = NULL,

	.set_vm_context_page_table_base = set_vm_context_page_table_base_v10_3,

	.get_hive_id = amdgpu_amdkfd_get_hive_id,

#if 0

	.enable_debug_trap = enable_debug_trap_v10_3,

	.disable_debug_trap = disable_debug_trap_v10_3,

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

+0 −1
Original line number Diff line number Diff line
@@ -726,5 +726,4 @@ const struct kfd2kgd_calls gfx_v9_kfd2kgd = { 
	.get_atc_vmid_pasid_mapping_info =

			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/amdkfd/kfd_device.c

+1 −2
Original line number Diff line number Diff line
@@ -712,8 +712,7 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, 
		goto kfd_doorbell_error;

	}



	if (kfd->kfd2kgd->get_hive_id)

		kfd->hive_id = kfd->kfd2kgd->get_hive_id(kfd->kgd);

	kfd->hive_id = amdgpu_amdkfd_get_hive_id(kfd->kgd);



	kfd->unique_id = amdgpu_amdkfd_get_unique_id(kfd->kgd);