drm/amdkfd: Correct the topology message for APUs

At bootup on a Strix machine the following message comes up:
```
amdgpu: Topology: Add dGPU node [0x150e:0x1002]
```

This is an APU though. Clarify the messaging by only offer a
"CPU node" or "GPU node" message. Also set the message as
VID:DID instead which is how other messages work.

Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
index 7a402c9c1b6e60c5d1c9e37e0289d27628a70f43..3c99571655b03ebaac5dcff83f2b149a888ab619 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
@@ -931,17 +931,12 @@ static void kfd_debug_print_topology(void)
        dev = list_last_entry(&topology_device_list,
                        struct kfd_topology_device, list);
        if (dev) {
-               if (dev->node_props.cpu_cores_count &&
-                               dev->node_props.simd_count) {
-                       pr_info("Topology: Add APU node [0x%0x:0x%0x]\n",
-                               dev->node_props.device_id,
-                               dev->node_props.vendor_id);
-               } else if (dev->node_props.cpu_cores_count)
+               if (dev->node_props.cpu_cores_count)
                        pr_info("Topology: Add CPU node\n");
-               else if (dev->node_props.simd_count)
-                       pr_info("Topology: Add dGPU node [0x%0x:0x%0x]\n",
-                               dev->node_props.device_id,
-                               dev->node_props.vendor_id);
+               else
+                       pr_info("Topology: Add GPU node [0x%0x:0x%0x]\n",
+                               dev->node_props.vendor_id,
+                               dev->node_props.device_id);
        }
        up_read(&topology_lock);
 }