Commit f7ce2fad authored by Flora Cui's avatar Flora Cui Committed by Oded Gabbay

drm/amdkfd: Update number of compute unit from KGD

Overwrite the active simd_count from KGD at driver loading time. This is
based on assumption that register GC_USER_SHADER_ARRAY_CONFIG won’t get
changed.

V2: remove the incorrect simd_count reported at loading module.
Signed-off-by: default avatarFlora Cui <flora.cui@amd.com>
Reviewed by: Yair Shachar< yair.shachar@amd.com>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Acked-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
parent 4248bd0b
...@@ -133,8 +133,7 @@ static void kfd_populated_cu_info_gpu(struct kfd_topology_device *dev, ...@@ -133,8 +133,7 @@ static void kfd_populated_cu_info_gpu(struct kfd_topology_device *dev,
dev->node_props.max_slots_scratch_cu = cu->max_slots_scatch_cu; dev->node_props.max_slots_scratch_cu = cu->max_slots_scatch_cu;
if (cu->hsa_capability & CRAT_CU_FLAGS_HOT_PLUGGABLE) if (cu->hsa_capability & CRAT_CU_FLAGS_HOT_PLUGGABLE)
dev->node_props.capability |= HSA_CAP_HOT_PLUGGABLE; dev->node_props.capability |= HSA_CAP_HOT_PLUGGABLE;
pr_info("CU GPU: simds=%d id_base=%d\n", cu->num_simd_cores, pr_info("CU GPU: id_base=%d\n", cu->processor_id_low);
cu->processor_id_low);
} }
/* kfd_parse_subtype_cu is called when the topology mutex is already acquired */ /* kfd_parse_subtype_cu is called when the topology mutex is already acquired */
...@@ -1124,6 +1123,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu) ...@@ -1124,6 +1123,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu)
{ {
uint32_t gpu_id; uint32_t gpu_id;
struct kfd_topology_device *dev; struct kfd_topology_device *dev;
struct kfd_cu_info cu_info;
int res; int res;
gpu_id = kfd_generate_gpu_id(gpu); gpu_id = kfd_generate_gpu_id(gpu);
...@@ -1161,6 +1161,9 @@ int kfd_topology_add_device(struct kfd_dev *gpu) ...@@ -1161,6 +1161,9 @@ int kfd_topology_add_device(struct kfd_dev *gpu)
dev->gpu_id = gpu_id; dev->gpu_id = gpu_id;
gpu->id = gpu_id; gpu->id = gpu_id;
dev->gpu->kfd2kgd->get_cu_info(dev->gpu->kgd, &cu_info);
dev->node_props.simd_count = dev->node_props.simd_per_cu *
cu_info.cu_active_number;
dev->node_props.vendor_id = gpu->pdev->vendor; dev->node_props.vendor_id = gpu->pdev->vendor;
dev->node_props.device_id = gpu->pdev->device; dev->node_props.device_id = gpu->pdev->device;
dev->node_props.location_id = (gpu->pdev->bus->number << 24) + dev->node_props.location_id = (gpu->pdev->bus->number << 24) +
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment