Commit 46096058 authored Feb 14, 2019 by Amber Lin Committed by Alex Deucher May 24, 2019

drm/amdkfd: Add domain number into gpu_id



A multi-socket server can have multiple PCIe segments so BFD is not enough
to distingush each GPU. Also add domain number into account when generating
gpu_id.

Signed-off-by: Amber Lin <Amber.Lin@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent ed81cd6e

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -1082,8 +1082,9 @@ static uint32_t kfd_generate_gpu_id(struct kfd_dev *gpu)
		local_mem_info.local_mem_size_public;

		buf[0] = gpu->pdev->devfn;
		buf[1] = gpu->pdev->subsystem_vendor;
		buf[2] = gpu->pdev->subsystem_device;
		buf[1] = gpu->pdev->subsystem_vendor \|
		(gpu->pdev->subsystem_device << 16);
		buf[2] = pci_domain_nr(gpu->pdev->bus);
		buf[3] = gpu->pdev->device;
		buf[4] = gpu->pdev->bus->number;
		buf[5] = lower_32_bits(local_mem_size);

Admin message