52 lines
1.4 KiB
Diff
52 lines
1.4 KiB
Diff
From 871e326ac799ae28ee4d98da9025028050c085cd Mon Sep 17 00:00:00 2001
|
|
From: Mario Limonciello <mario.limonciello@amd.com>
|
|
Date: Thu, 16 Oct 2025 10:53:01 -0500
|
|
Subject: [PATCH] amdgpu: Only read /proc/cpuinfo as a fallback
|
|
|
|
Some older Vega APUs don't provide a very useful string. If we have
|
|
a string in amdgpu.ids use that, but fallback to /proc/cpuinfo.
|
|
|
|
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
|
|
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
|
|
---
|
|
amdgpu/amdgpu_asic_id.c | 14 +++++++-------
|
|
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/amdgpu/amdgpu_asic_id.c b/amdgpu/amdgpu_asic_id.c
|
|
index 2eeca0ec..2e52666c 100644
|
|
--- a/amdgpu/amdgpu_asic_id.c
|
|
+++ b/amdgpu/amdgpu_asic_id.c
|
|
@@ -169,17 +169,11 @@ void amdgpu_parse_asic_ids(struct amdgpu_device *dev)
|
|
int line_num = 1;
|
|
int r = 0;
|
|
|
|
- if (dev->info.ids_flags & AMDGPU_IDS_FLAGS_FUSION) {
|
|
- amdgpu_parse_proc_cpuinfo(dev);
|
|
- if (dev->marketing_name != NULL)
|
|
- return;
|
|
- }
|
|
-
|
|
fp = fopen(AMDGPU_ASIC_ID_TABLE, "r");
|
|
if (!fp) {
|
|
fprintf(stderr, "%s: %s\n", AMDGPU_ASIC_ID_TABLE,
|
|
strerror(errno));
|
|
- return;
|
|
+ goto get_cpu;
|
|
}
|
|
|
|
/* 1st valid line is file version */
|
|
@@ -220,4 +214,10 @@ void amdgpu_parse_asic_ids(struct amdgpu_device *dev)
|
|
|
|
free(line);
|
|
fclose(fp);
|
|
+
|
|
+get_cpu:
|
|
+ if (dev->info.ids_flags & AMDGPU_IDS_FLAGS_FUSION &&
|
|
+ dev->marketing_name == NULL) {
|
|
+ amdgpu_parse_proc_cpuinfo(dev);
|
|
+ }
|
|
}
|
|
--
|
|
2.50.0
|
|
|