AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[SWDEV-536176] libdrm_amdgpu depdency change (#448)"

Browse Source 
This reverts commit 4d33e79baa.


[ROCm/amdsmi commit: ed2300516f]
This commit is contained in:
Arif, Maisam
2025-08-27 20:10:52 -05:00
parent 190ed3953d
commit 433893c770
8 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/amdsmi/src/CMakeLists.txt
+1 -1
View File
@@ -78,7 +78,7 @@ set(${AMD_SMI}_VERSION_BUILD "0")
message("SOVERSION: ${SO_VERSION_STRING}")
add_library(${AMD_SMI} ${SRC_LIST} ${INC_LIST})
target_link_libraries(${AMD_SMI} pthread rt dl)
target_link_libraries(${AMD_SMI} pthread rt dl ${DRM_LIBRARIES} ${AMDGPU_DRM_LIBRARIES})
target_include_directories(${AMD_SMI} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/rocm_smi/include
${PROJECT_SOURCE_DIR}/common/shared_mutex ${ACA_INC_DIR})
projects/amdsmi/src/amd_smi/amd_smi.cc
+12 -12
View File
@@ -924,11 +924,11 @@ amdsmi_status_t amdsmi_get_gpu_vram_usage(amdsmi_processor_handle processor_hand
}
amd::smi::AMDSmiLibraryLoader libdrm;
amdsmi_status_t status = libdrm.load("libdrm_amdgpu.so.1");
amdsmi_status_t status = libdrm.load("libdrm.so.2");
if (status != AMDSMI_STATUS_SUCCESS) {
libdrm.unload();
ss << __PRETTY_FUNCTION__
<< " | Failed to load libdrm_amdgpu.so: " << strerror(errno)
<< " | Failed to load libdrm.so.2: " << strerror(errno)
<< "; Returning: " << smi_amdgpu_get_status_string(status, false);
LOG_ERROR(ss);
return status;
@@ -1730,11 +1730,11 @@ amdsmi_get_gpu_asic_info(amdsmi_processor_handle processor_handle, amdsmi_asic_i
}
amd::smi::AMDSmiLibraryLoader libdrm;
status = libdrm.load("libdrm_amdgpu.so");
status = libdrm.load("libdrm.so.2");
if (status != AMDSMI_STATUS_SUCCESS) {
libdrm.unload();
ss << __PRETTY_FUNCTION__
<< " | Failed to load libdrm_amdgpu.so: " << strerror(errno)
<< " | Failed to load libdrm.so.2: " << strerror(errno)
<< "; Returning: " << smi_amdgpu_get_status_string(status, false);
LOG_ERROR(ss);
return status;
@@ -1953,11 +1953,11 @@ amdsmi_status_t amdsmi_get_gpu_vram_info(
}
amd::smi::AMDSmiLibraryLoader libdrm;
amdsmi_status_t status = libdrm.load("libdrm_amdgpu.so");
amdsmi_status_t status = libdrm.load("libdrm.so.2");
if (status != AMDSMI_STATUS_SUCCESS) {
libdrm.unload();
ss << __PRETTY_FUNCTION__
<< " | Failed to load libdrm_amdgpu.so: " << strerror(errno)
<< " | Failed to load libdrm.so.2: " << strerror(errno)
<< "; Returning: " << smi_amdgpu_get_status_string(status, false);
LOG_ERROR(ss);
return status;
@@ -3888,11 +3888,11 @@ amdsmi_get_gpu_vbios_info(amdsmi_processor_handle processor_handle, amdsmi_vbios
}
amd::smi::AMDSmiLibraryLoader libdrm;
status = libdrm.load("libdrm_amdgpu.so");
status = libdrm.load("libdrm.so.2");
if (status != AMDSMI_STATUS_SUCCESS) {
libdrm.unload();
ss << __PRETTY_FUNCTION__
<< " | Failed to load libdrm_amdgpu.so: " << strerror(errno)
<< " | Failed to load libdrm.so.2: " << strerror(errno)
<< "; Returning: " << smi_amdgpu_get_status_string(status, false);
LOG_ERROR(ss);
return status;
@@ -4450,11 +4450,11 @@ amdsmi_status_t amdsmi_get_gpu_driver_info(amdsmi_processor_handle processor_han
return AMDSMI_STATUS_FILE_ERROR;
}
amd::smi::AMDSmiLibraryLoader libdrm;
status = libdrm.load("libdrm_amdgpu.so");
status = libdrm.load("libdrm.so.2");
if (status != AMDSMI_STATUS_SUCCESS) {
libdrm.unload();
ss << __PRETTY_FUNCTION__
<< " | Failed to load libdrm_amdgpu.so"
<< " | Failed to load libdrm.so.2"
<< "; Returning: " << smi_amdgpu_get_status_string(status, false);
LOG_ERROR(ss);
return status;
@@ -4927,11 +4927,11 @@ amdsmi_get_gpu_virtualization_mode(amdsmi_processor_handle processor_handle,
}
amd::smi::AMDSmiLibraryLoader libdrm;
status = libdrm.load("libdrm_amdgpu.so");
status = libdrm.load("libdrm.so.2");
if (status != AMDSMI_STATUS_SUCCESS) {
libdrm.unload();
ss << __PRETTY_FUNCTION__
<< " | Failed to load libdrm_amdgpu.so"
<< " | Failed to load libdrm.so.2"
<< "; Returning: " << smi_amdgpu_get_status_string(status, false);
LOG_ERROR(ss);
return status;
projects/amdsmi/src/amd_smi/amd_smi_drm.cc
+1 -1
View File
@@ -59,7 +59,7 @@ std::string AMDSmiDrm::find_file_in_folder(const std::string& folder,
}
amdsmi_status_t AMDSmiDrm::init() {
amdsmi_status_t status = lib_loader_.load("libdrm_amdgpu.so");
amdsmi_status_t status = lib_loader_.load("libdrm.so.2");
if (status != AMDSMI_STATUS_SUCCESS) {
return status;
}