Revert "Get Marketing name from libdrm-amdgpu"

This reverts commit cb1c84d99b.

Reason for revert: aqlprofiler hasn't promoted yet

Change-Id: I9e6a4169f014a6181f43ee8ef4810be2667d98bd
This commit is contained in:
Kent Russell
2021-08-30 13:29:45 -04:00
parent bcd49af8bb
commit 89c9d6a3b9
6 changed files with 379 additions and 64 deletions
+6 -1
View File
@@ -2150,6 +2150,7 @@ HSAKMT_STATUS fmm_init_process_apertures(unsigned int NumNodes)
HSAKMT_STATUS ret = HSAKMT_STATUS_SUCCESS;
char *disableCache, *pagedUserptr, *checkUserptr, *guardPagesStr, *reserveSvm;
unsigned int guardPages = 1;
struct pci_ids pacc;
uint64_t svm_base = 0, svm_limit = 0;
uint32_t svm_alignment = 0;
@@ -2196,11 +2197,13 @@ HSAKMT_STATUS fmm_init_process_apertures(unsigned int NumNodes)
* gets called before hsaKmtAcquireSystemProperties() is called.
*/
pacc = pci_ids_create();
is_dgpu = false;
for (i = 0; i < NumNodes; i++) {
memset(&props, 0, sizeof(props));
ret = topology_sysfs_get_node_props(i, &props, &gpu_id, NULL, NULL);
ret = topology_sysfs_get_node_props(i, &props, &gpu_id, pacc, NULL, NULL);
if (ret != HSAKMT_STATUS_SUCCESS)
goto sysfs_parse_failed;
@@ -2237,6 +2240,8 @@ HSAKMT_STATUS fmm_init_process_apertures(unsigned int NumNodes)
}
}
pci_ids_destroy(pacc);
/* The ioctl will also return Number of Nodes if
* args.kfd_process_device_apertures_ptr is set to NULL. This is not
* required since Number of nodes is already known. Kernel will fill in