Load libdrm at run time

Remove the compile time dependency on libdrm. Load it at the run
time instead.

Add the headers missed from smi-lib

Change-Id: Ie1ecf293b51425b6a61c502d11a42809dc099f70

amd_smi/include/impl/amd_smi_drm.h

@@ -49,6 +49,7 @@
 #include <memory>
 #include <mutex>  // NOLINT
 #include "amd_smi.h"
+#include "impl/amd_smi_lib_loader.h"
 
 namespace amd {
 namespace smi {
@@ -58,16 +59,19 @@ class AMDSmiDrm {
     amdsmi_status_t init();
     amdsmi_status_t cleanup();
     int get_drm_fd_by_index(uint32_t gpu_index) const;
-    int amdgpu_query_info(int fd, unsigned info_id,
+    amdsmi_status_t amdgpu_query_info(int fd, unsigned info_id,
                     unsigned size, void *value);
-    int  amdgpu_query_fw(int fd, unsigned info_id, unsigned fw_type,
+    amdsmi_status_t  amdgpu_query_fw(int fd, unsigned info_id, unsigned fw_type,
                 unsigned size, void *value);
-    int amdgpu_query_hw_ip(int fd, unsigned info_id, unsigned hw_ip_type,
-                unsigned size, void *value);
-    int amdgpu_query_vbios(int fd, void *info);
+    amdsmi_status_t amdgpu_query_hw_ip(int fd, unsigned info_id,
+               unsigned hw_ip_type, unsigned size, void *value);
+    amdsmi_status_t amdgpu_query_vbios(int fd, void *info);
 
  private:
+    using DrmCmdWriteFunc = int (*)(int, unsigned long, void *, unsigned long);
     std::vector<int> drm_fds_;  // drm file descriptor by gpu_index
+    AMDSmiLibraryLoader lib_loader_;  // lazy load libdrm
+    DrmCmdWriteFunc drm_cmd_write_;   // drmCommandWrite
     std::mutex drm_mutex_;
 };
 

amd_smi/include/impl/amd_smi_gpu_device.h

@@ -57,13 +57,13 @@ class AMDSmiGPUDevice: public AMDSmiDevice {
             AMDSmiDevice(AMD_GPU), gpu_id_(gpu_id), drm_(drm) {}
 
     uint32_t get_gpu_id() const;
-    int amdgpu_query_info(unsigned info_id,
+    amdsmi_status_t amdgpu_query_info(unsigned info_id,
                     unsigned size, void *value) const;
-    int amdgpu_query_hw_ip(unsigned info_id, unsigned hw_ip_type,
+    amdsmi_status_t amdgpu_query_hw_ip(unsigned info_id, unsigned hw_ip_type,
             unsigned size, void *value) const;
-    int amdgpu_query_fw(unsigned info_id, unsigned fw_type,
+    amdsmi_status_t amdgpu_query_fw(unsigned info_id, unsigned fw_type,
             unsigned size, void *value) const;
-    int amdgpu_query_vbios(void *info) const;
+    amdsmi_status_t amdgpu_query_vbios(void *info) const;
  private:
     uint32_t gpu_id_;
     AMDSmiDrm& drm_;

amd_smi/include/impl/amd_smi_lib_loader.h

@@ -0,0 +1,82 @@
+/*
+Copyright (c) 2020 - present Advanced Micro Devices, Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+#ifndef AMD_SMI_INCLUDE_IMPL_AMD_SMI_LIB_LOADER_H_
+#define AMD_SMI_INCLUDE_IMPL_AMD_SMI_LIB_LOADER_H_
+#include <dlfcn.h>
+#include <string.h>
+#include <map>
+#include <iostream>
+#include <mutex>   //  NOLINT(build/c++11)
+#include "amd_smi.h"
+
+
+namespace amd {
+namespace smi {
+class AMDSmiLibraryLoader {
+ public:
+     AMDSmiLibraryLoader();
+
+     amdsmi_status_t load(const char* filename);
+
+     template<typename T> amdsmi_status_t load_symbol(T* func_handler,
+            const char* func_name);
+
+
+     amdsmi_status_t unload();
+
+     ~AMDSmiLibraryLoader();
+
+ private:
+     void* libHandler_;
+     std::mutex library_mutex_;
+};
+
+template<typename T> amdsmi_status_t AMDSmiLibraryLoader::load_symbol(
+            T* func_handler,
+            const char* func_name) {
+    if (!libHandler_) {
+        return AMDSMI_STATUS_FAIL_LOAD_MODULE;
+    }
+
+    if (!func_handler || !func_name) {
+        return AMDSMI_STATUS_FAIL_LOAD_SYMBOL;
+    }
+
+    std::lock_guard<std::mutex> guard(library_mutex_);
+
+    *reinterpret_cast<void**>(func_handler) =
+            dlsym(libHandler_, func_name);
+    if (*func_handler == nullptr) {
+        char* error = dlerror();
+        std::cerr << "AMDSmiLibraryLoader: Fail to load the symbol "
+                    << func_name << ": " << error << std::endl;
+        return AMDSMI_STATUS_FAIL_LOAD_SYMBOL;
+    }
+
+    return AMDSMI_STATUS_SUCCESS;
+}
+
+}  // namespace smi
+}  // namespace amd
+
+
+#endif  // AMD_SMI_INCLUDE_IMPL_AMD_SMI_LIB_LOADER_H_