From bbc9b26788bd09b12d38fcd144f998bddf80daa6 Mon Sep 17 00:00:00 2001
From: Vladislav Sytchenko <Vladislav.Sytchenko@amd.com>
Date: Wed, 2 Jun 2021 17:11:16 -0400
Subject: [PATCH] SWDEV-273235 - Find UGL headers based on AMD_DRIVERS_PATH

All KMD/asic_reg/UGL headers are located under the drivers folder. No
need for the AMD_UGL_PATH variable as it essentially is
${AMD_DRIVERS_PATH}/ugl.

Change-Id: I070d737d50f2096493b3e75ef9b9e824cb19d048


[ROCm/clr commit: 1423c1db646d42aaba62200ce83692d3e918984c]
---
 projects/clr/rocclr/cmake/FindAMD_UGL.cmake | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/projects/clr/rocclr/cmake/FindAMD_UGL.cmake b/projects/clr/rocclr/cmake/FindAMD_UGL.cmake
index b730de6f63..d30520434b 100644
--- a/projects/clr/rocclr/cmake/FindAMD_UGL.cmake
+++ b/projects/clr/rocclr/cmake/FindAMD_UGL.cmake
@@ -24,17 +24,18 @@ endif()
 
 find_path(AMD_UGL_INCLUDE_DIR GL/glx.h
   HINTS
-    ${AMD_UGL_PATH}
+    ${AMD_DRIVERS_PATH}
   PATHS
     # p4 repo layout
-    ${CMAKE_SOURCE_DIR}/drivers/ugl/inc
-    ${CMAKE_SOURCE_DIR}/../drivers/ugl/inc
-    ${CMAKE_SOURCE_DIR}/../../drivers/ugl/inc
+    ${CMAKE_SOURCE_DIR}/drivers
+    ${CMAKE_SOURCE_DIR}/../drivers
+    ${CMAKE_SOURCE_DIR}/../../drivers
     # github ent repo layout
-    ${CMAKE_SOURCE_DIR}/drivers/drivers/ugl/inc
-    ${CMAKE_SOURCE_DIR}/../drivers/drivers/ugl/inc
-    ${CMAKE_SOURCE_DIR}/../../drivers/drivers/ugl/inc
-  NO_DEFAULT_PATH)
+    ${CMAKE_SOURCE_DIR}/drivers/drivers
+    ${CMAKE_SOURCE_DIR}/../drivers/drivers
+    ${CMAKE_SOURCE_DIR}/../../drivers/drivers
+  PATH_SUFFIXES
+    ugl/inc)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(AMD_UGL