From 454da807dff2dbf7ba3d087d08a52d18b3ef4f6f Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Thu, 6 Jul 2017 16:57:49 -0400
Subject: [PATCH] P4 to Git Change 1431060 by gandryey@gera-w8 on 2017/07/06
 16:31:22

	SWDEV-79445 - OCL generic changes and code clean-up
	- Return initialization failure if runtime couldn't find the library function

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/pro/prodevice.cpp#3 edit
---
 rocclr/runtime/device/rocm/pro/prodevice.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/rocclr/runtime/device/rocm/pro/prodevice.cpp b/rocclr/runtime/device/rocm/pro/prodevice.cpp
index c45b318e39..9d44cdeee3 100644
--- a/rocclr/runtime/device/rocm/pro/prodevice.cpp
+++ b/rocclr/runtime/device/rocm/pro/prodevice.cpp
@@ -56,33 +56,43 @@ bool ProDevice::DrmInit()
       funcs_.DrmGetDevices = reinterpret_cast<drm::DrmGetDevices>(dlsym(
                              lib_drm_handle_,
                              "drmGetDevices"));
+      if (funcs_.DrmGetDevices == nullptr) return false;
       funcs_.AmdgpuDeviceInitialize = reinterpret_cast<drm::AmdgpuDeviceInitialize>(dlsym(
                              lib_drm_handle_,
                              "amdgpu_device_initialize"));
+      if (funcs_.AmdgpuDeviceInitialize == nullptr) return false;
       funcs_.AmdgpuDeviceDeinitialize = reinterpret_cast<drm::AmdgpuDeviceDeinitialize>(dlsym(
                              lib_drm_handle_,
                              "amdgpu_device_deinitialize"));
+      if (funcs_.AmdgpuDeviceDeinitialize == nullptr) return false;
       funcs_.AmdgpuQueryGpuInfo = reinterpret_cast<drm::AmdgpuQueryGpuInfo>(dlsym(
                              lib_drm_handle_,
                              "amdgpu_query_gpu_info"));
+      if (funcs_.AmdgpuQueryGpuInfo == nullptr) return false;
       funcs_.AmdgpuQueryInfo = reinterpret_cast<drm::AmdgpuQueryInfo>(dlsym(
                              lib_drm_handle_,
                              "amdgpu_query_info"));
+      if (funcs_.AmdgpuQueryInfo == nullptr) return false;
       funcs_.AmdgpuBoAlloc = reinterpret_cast<drm::AmdgpuBoAlloc>(dlsym(
                              lib_drm_handle_,
                              "amdgpu_bo_alloc"));
+      if (funcs_.AmdgpuBoAlloc == nullptr) return false;
       funcs_.AmdgpuBoExport = reinterpret_cast<drm::AmdgpuBoExport>(dlsym(
                              lib_drm_handle_,
                              "amdgpu_bo_export"));
+      if (funcs_.AmdgpuBoExport == nullptr) return false;
       funcs_.AmdgpuBoFree = reinterpret_cast<drm::AmdgpuBoFree>(dlsym(
                              lib_drm_handle_,
                              "amdgpu_bo_free"));
+      if (funcs_.AmdgpuBoFree == nullptr) return false;
       funcs_.AmdgpuBoCpuMap = reinterpret_cast<drm::AmdgpuBoCpuMap>(dlsym(
                              lib_drm_handle_,
                              "amdgpu_bo_cpu_map"));
+      if (funcs_.AmdgpuBoCpuMap == nullptr) return false;
       funcs_.AmdgpuBoCpuUnmap = reinterpret_cast<drm::AmdgpuBoCpuUnmap>(dlsym(
                              lib_drm_handle_,
                              "amdgpu_bo_cpu_unmap"));
+      if (funcs_.AmdgpuBoCpuUnmap == nullptr) return false;
     }
   }