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

* Cmake fix updates
* Next fix will be addressing libdrm further

---------

Signed-off-by: adapryor <Adam.pryor@amd.com>
Signed-off-by: Justin Williams <juwillia@amd.com>

[ROCm/amdsmi commit: 652761de54]

projects/amdsmi/.github/workflows/codeql.yml

@@ -56,7 +56,7 @@ jobs:
       run: sudo apt-get install -y g++ 
 
     - name: Install libdrm
-      run: sudo apt-get install -y libdrm-dev
+      run: sudo apt-get install -y libdrm-amdgpu-dev
   
     - name: Install DOxygen  
       run: sudo apt-get install -y doxygen  

projects/amdsmi/CMakeLists.txt

@@ -318,7 +318,7 @@ install(
 add_subdirectory(goamdsmi_shim)
 
 #Debian package specific variables
-set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "python3-argcomplete, libdrm-dev, libdrm-amdgpu-dev")
+set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "python3-argcomplete, libdrm-amdgpu-dev")
 set(CPACK_DEBIAN_ASAN_PACKAGE_RECOMMENDS ${CPACK_DEBIAN_PACKAGE_RECOMMENDS})
 set(CPACK_DEBIAN_DEV_PACKAGE_RECOMMENDS ${CPACK_DEBIAN_PACKAGE_RECOMMENDS})
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "sudo, libc6, python3 (>= 3.6.8), python3-pip, python3-setuptools, python3-wheel")
@@ -390,11 +390,11 @@ if(CPACK_RPM_PACKAGE_RELEASE)
     set(CPACK_RPM_PACKAGE_RELEASE_DIST ON)
 endif()
 # NOTE: RPM SUGGESTS DO NOT WORK! https://bugzilla.redhat.com/show_bug.cgi?id=1811358
-set(CPACK_RPM_PACKAGE_SUGGESTS "python3-argcomplete, libdrm-dev, libdrm-amdgpu-dev")
+set(CPACK_RPM_PACKAGE_RECOMMENDS "python3-argcomplete")
 set(CPACK_RPM_DEV_PACKAGE_SUGGESTS ${CPACK_RPM_PACKAGE_SUGGESTS})
 set(CPACK_RPM_ASAN_PACKAGE_SUGGESTS ${CPACK_RPM_PACKAGE_SUGGESTS})
 # python version gated by rhel8 :(
-set(CPACK_RPM_PACKAGE_REQUIRES "sudo, python3 >= 3.6.8, python3-pip, python3-wheel, python3-setuptools")
+set(CPACK_RPM_PACKAGE_REQUIRES "sudo, python3 >= 3.6.8, python3-pip, libdrm-amdgpu-devel")
 set(CPACK_RPM_DEV_PACKAGE_REQUIRES ${CPACK_RPM_PACKAGE_REQUIRES})
 set(CPACK_RPM_ASAN_PACKAGE_REQUIRES ${CPACK_RPM_PACKAGE_REQUIRES})
 

projects/amdsmi/README.md

@@ -171,8 +171,8 @@ during development; earlier versions are not guaranteed to work.
 
 * CMake (v3.20.0 or later) -- `python3 -m pip install cmake`
 * g++ (v5.4.0 or later)
-* libdrm-dev (for Ubuntu and Debian)
-* libdrm-devel (for RPM-based distributions)
+* libdrm-amdgpu-dev (for Ubuntu and Debian)
+* libdrm-amdgpu-devel (for RPM-based distributions)
 
 In order to build the AMD SMI Python package, the following components are required:
 

projects/amdsmi/docs/install/build.md

@@ -18,8 +18,8 @@ versions are not guaranteed to work.
 
 * CMake (v3.15.0 or later) -- `python3 -m pip install cmake`
 * g++ (v5.4.0 or later)
-* libdrm-dev (for Ubuntu and Debian)
-* libdrm-devel (for RPM-based distributions)
+* libdrm-amdgpu-dev (for Ubuntu and Debian)
+* libdrm-amdgpu-devel (for RPM-based distributions)
 
 In order to build the AMD SMI Python package, the following components are
 required:

projects/amdsmi/py-interface/Dockerfile

@@ -15,7 +15,7 @@ RUN apt update --yes \
             cmake \
             git \
             gnupg \
-            libdrm-dev \
+            libdrm-amdgpu-dev \
             libpython3-dev \
             lsb-release \
             pkg-config \

projects/amdsmi/src/CMakeLists.txt

@@ -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 ${DRM_LIBRARIES} ${AMDGPU_DRM_LIBRARIES})
+target_link_libraries(${AMD_SMI} pthread rt dl)
 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

@@ -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.so.2");
+    amdsmi_status_t status = libdrm.load("libdrm_amdgpu.so.1");
     if (status != AMDSMI_STATUS_SUCCESS) {
         libdrm.unload();
         ss << __PRETTY_FUNCTION__
-           << " | Failed to load libdrm.so.2: " << strerror(errno)
+           << " | Failed to load libdrm_amdgpu.so: " << 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.so.2");
+    status = libdrm.load("libdrm_amdgpu.so");
     if (status != AMDSMI_STATUS_SUCCESS) {
         libdrm.unload();
         ss << __PRETTY_FUNCTION__
-           << " | Failed to load libdrm.so.2: " << strerror(errno)
+           << " | Failed to load libdrm_amdgpu.so: " << 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.so.2");
+    amdsmi_status_t status = libdrm.load("libdrm_amdgpu.so");
     if (status != AMDSMI_STATUS_SUCCESS) {
         libdrm.unload();
         ss << __PRETTY_FUNCTION__
-           << " | Failed to load libdrm.so.2: " << strerror(errno)
+           << " | Failed to load libdrm_amdgpu.so: " << 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.so.2");
+    status = libdrm.load("libdrm_amdgpu.so");
     if (status != AMDSMI_STATUS_SUCCESS) {
         libdrm.unload();
         ss << __PRETTY_FUNCTION__
-           << " | Failed to load libdrm.so.2: " << strerror(errno)
+           << " | Failed to load libdrm_amdgpu.so: " << 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.so.2");
+    status = libdrm.load("libdrm_amdgpu.so");
     if (status != AMDSMI_STATUS_SUCCESS) {
         libdrm.unload();
         ss << __PRETTY_FUNCTION__
-           << " | Failed to load libdrm.so.2"
+           << " | Failed to load libdrm_amdgpu.so"
            << "; 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.so.2");
+    status = libdrm.load("libdrm_amdgpu.so");
     if (status != AMDSMI_STATUS_SUCCESS) {
         libdrm.unload();
         ss << __PRETTY_FUNCTION__
-           << " | Failed to load libdrm.so.2"
+           << " | Failed to load libdrm_amdgpu.so"
            << "; Returning: " << smi_amdgpu_get_status_string(status, false);
         LOG_ERROR(ss);
         return status;

projects/amdsmi/src/amd_smi/amd_smi_drm.cc

@@ -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.so.2");
+    amdsmi_status_t status = lib_loader_.load("libdrm_amdgpu.so");
     if (status != AMDSMI_STATUS_SUCCESS) {
         return status;
     }