Commit 817154c1 authored by Felix Kuehling's avatar Felix Kuehling Committed by Alex Deucher
Browse files

drm/amdkfd: call amdgpu_amdkfd_get_unique_id directly 



No need to use a function pointer because the implementation is not
ASIC-specific. This fixes missing support due to a missing function
pointer on Arcturus.

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 778879b9

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

+0 −1
Original line number Diff line number Diff line
@@ -777,5 +777,4 @@ const struct kfd2kgd_calls gfx_v10_kfd2kgd = { 
			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,

	.get_unique_id = amdgpu_amdkfd_get_unique_id,

};

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

+0 −1
Original line number Diff line number Diff line
@@ -727,5 +727,4 @@ const struct kfd2kgd_calls gfx_v9_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,

	.get_unique_id = amdgpu_amdkfd_get_unique_id,

};

drivers/gpu/drm/amd/amdkfd/kfd_device.c

+1 −2
Original line number Diff line number Diff line
@@ -715,8 +715,7 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, 
	if (kfd->kfd2kgd->get_hive_id)

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



	if (kfd->kfd2kgd->get_unique_id)

		kfd->unique_id = kfd->kfd2kgd->get_unique_id(kfd->kgd);

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



	if (kfd_interrupt_init(kfd)) {

		dev_err(kfd_device, "Error initializing interrupts\n");

drivers/gpu/drm/amd/include/kgd_kfd_interface.h

+0 −4
Original line number Diff line number Diff line
@@ -214,8 +214,6 @@ struct tile_config { 
 *

 * @get_hive_id: Returns hive id of current  device,  0 if xgmi is not enabled

 *

 * @get_unique_id: Returns uuid id of current  device

 * 

 * This structure contains function pointers to services that the kgd driver

 * provides to amdkfd driver.

 *
@@ -291,8 +289,6 @@ struct kfd2kgd_calls { 
			uint32_t vmid, uint64_t page_table_base);

	uint32_t (*read_vmid_from_vmfault_reg)(struct kgd_dev *kgd);

	uint64_t (*get_hive_id)(struct kgd_dev *kgd);

	uint64_t (*get_unique_id)(struct kgd_dev *kgd);



};



#endif	/* KGD_KFD_INTERFACE_H_INCLUDED */