From: Harish Kasiviswanathan Date: Sat, 9 Dec 2017 04:08:47 +0000 (-0500) Subject: drm/amdkfd: Topology: Fix location_id X-Git-Tag: v4.16-rc1~96^2~16^2~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d63f0ba27a3ee33211de4ec7f2c4287a03492cb2;p=thirdparty%2Fkernel%2Flinux.git drm/amdkfd: Topology: Fix location_id Fix location_id format to match Thunk specification. Signed-off-by: Harish Kasiviswanathan Signed-off-by: Felix Kuehling Reviewed-by: Oded Gabbay Signed-off-by: Oded Gabbay --- diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c index ca2e51a2fe75c..b614746c2523f 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c @@ -1166,8 +1166,8 @@ int kfd_topology_add_device(struct kfd_dev *gpu) cu_info.cu_active_number; dev->node_props.vendor_id = gpu->pdev->vendor; dev->node_props.device_id = gpu->pdev->device; - dev->node_props.location_id = (gpu->pdev->bus->number << 24) + - (gpu->pdev->devfn & 0xffffff); + dev->node_props.location_id = PCI_DEVID(gpu->pdev->bus->number, + gpu->pdev->devfn); /* * TODO: Retrieve max engine clock values from KGD */