Fix delay loading of drm by soname.

[ROCm/amdsmi commit: 4d5d24d1c6]

projects/amdsmi/src/CMakeLists.txt

@@ -80,13 +80,17 @@ message("SOVERSION: ${SO_VERSION_STRING}")
 add_library(${AMD_SMI} ${SRC_LIST} ${INC_LIST})
 target_link_libraries(${AMD_SMI} PRIVATE
     rt
-    PkgConfig::DRM
-    PkgConfig::DRM_AMDGPU
     Threads::Threads
     ${CMAKE_DL_LIBS}
 )
-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})
+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}
+    ${DRM_INCLUDE_DIRS}
+    ${DRM_AMDGPU_INCLUDE_DIRS}                                          
+)
 
 # use the target_include_directories() command to specify the include directories for the target
 target_include_directories(${AMD_SMI} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"

projects/amdsmi/src/amd_smi/amd_smi_utils.cc

@@ -45,6 +45,7 @@
 #include <regex>
 #include <sstream>
 
+#include "config/amd_smi_config.h"
 #include "amd_smi/impl/amd_smi_utils.h"
 #include "amd_smi/impl/amd_smi_system.h"
 #include "shared_mutex.h"  // NOLINT
@@ -680,7 +681,7 @@ amdsmi_status_t smi_amdgpu_get_market_name_from_dev_id(amd::smi::AMDSmiGPUDevice
     }
 
     amd::smi::AMDSmiLibraryLoader libdrm_amdgpu_;
-    amdsmi_status_t status = libdrm_amdgpu_.load("libdrm_amdgpu.so");
+    amdsmi_status_t status = libdrm_amdgpu_.load(LIBDRM_AMDGPU_SONAME);
     if (status != AMDSMI_STATUS_SUCCESS) {
       libdrm_amdgpu_.unload();
       return status;