Create wrappers for different version of i915 headers

Related-To: NEO-6852
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

Author: JablonskiMateusz

level_zero/tools/source/debug/linux/prelim/debug_session.h

@@ -8,14 +8,13 @@
 #pragma once
 #include "shared/source/helpers/topology_map.h"
 #include "shared/source/os_interface/linux/drm_debug.h"
+#include "shared/source/os_interface/linux/i915_prelim.h"
 #include "shared/source/os_interface/linux/sys_calls.h"
 
 #include "level_zero/core/source/device/device.h"
 #include "level_zero/tools/source/debug/debug_session.h"
 #include "level_zero/tools/source/debug/debug_session_imp.h"
 
-#include "third_party/uapi/prelim/drm/i915_drm.h"
-
 #include <atomic>
 #include <mutex>
 #include <queue>

level_zero/tools/source/metrics/linux/os_metric_ip_sampling_imp_linux.cpp

@@ -9,6 +9,7 @@
 #include "shared/source/helpers/constants.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
+#include "shared/source/os_interface/linux/i915.h"
 #include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/source/os_interface/linux/sys_calls.h"
 #include "shared/source/os_interface/os_interface.h"
@@ -17,8 +18,6 @@
 #include "level_zero/core/source/device/device_imp.h"
 #include "level_zero/tools/source/metrics/os_metric_ip_sampling.h"
 
-#include "drm/i915_drm.h"
-
 #include <algorithm>
 
 namespace L0 {

level_zero/tools/source/sysman/engine/linux/os_engine_imp.cpp

@@ -8,8 +8,8 @@
 #include "level_zero/tools/source/sysman/engine/linux/os_engine_imp.h"
 
 #include "shared/source/os_interface/linux/engine_info.h"
+#include "shared/source/os_interface/linux/i915.h"
 
-#include "drm/i915_drm.h"
 #include "sysman/linux/os_sysman_imp.h"
 
 namespace L0 {

level_zero/tools/source/sysman/memory/linux/os_memory_imp_dg1.cpp

@@ -6,12 +6,12 @@
  */
 
 #include "shared/source/memory_manager/memory_manager.h"
+#include "shared/source/os_interface/linux/i915.h"
 #include "shared/source/os_interface/linux/memory_info.h"
 
 #include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/tools/source/sysman/memory/linux/os_memory_imp.h"
 
-#include "drm/i915_drm.h"
 #include "sysman/linux/os_sysman_imp.h"
 
 namespace L0 {

level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.cpp

@@ -8,12 +8,12 @@
 #include "level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.h"
 
 #include "shared/source/memory_manager/memory_manager.h"
+#include "shared/source/os_interface/linux/i915.h"
 #include "shared/source/os_interface/linux/system_info.h"
 
 #include "level_zero/core/source/driver/driver_handle.h"
 #include "level_zero/tools/source/sysman/sysman_const.h"
 
-#include "drm/i915_drm.h"
 #include "drm/intel_hwconfig_types.h"
 #include "igfxfmid.h"
 #include "sysman/linux/os_sysman_imp.h"

level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp_prelim.cpp

@@ -6,10 +6,10 @@
  */
 
 #include "shared/source/os_interface/linux/engine_info.h"
+#include "shared/source/os_interface/linux/i915.h"
 
 #include "level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp.h"
 
-#include "drm/i915_drm.h"
 #include "sysman/linux/os_sysman_imp.h"
 
 namespace L0 {

level_zero/tools/test/unit_tests/sources/debug/linux/test_debug_api_linux.cpp

@@ -5,32 +5,29 @@
  *
  */
 
+#include "shared/source/os_interface/linux/i915_prelim.h"
 // Force prelim headers over upstream headers
-// clang-format off
-#include "third_party/uapi/prelim/drm/i915_drm.h"
-// clang-format on
-
 // prevent including any other headers to avoid redefintion errors
 #define _I915_DRM_H_
 #define _UAPI_I915_DRM_H_
 
 #include "shared/source/os_interface/linux/drm_debug.h"
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/libult/linux/drm_mock_helper.h"
 #include "shared/test/common/libult/linux/drm_query_mock.h"
 #include "shared/test/common/mocks/mock_sip.h"
+#include "shared/test/common/mocks/ult_device_factory.h"
 #include "shared/test/common/test_macros/test.h"
+#include "shared/test/unit_test/helpers/gtest_helpers.h"
 
-#include "shared/test/common/libult/linux/drm_mock_helper.h"
 #include "level_zero/core/source/hw_helpers/l0_hw_helper.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h"
 #include "level_zero/include/zet_intel_gpu_debug.h"
 #include "level_zero/tools/source/debug/debug_handlers.h"
 #include "level_zero/tools/source/debug/linux/prelim/debug_session.h"
 #include "level_zero/tools/test/unit_tests/sources/debug/mock_debug_session.h"
-#include "shared/test/common/mocks/ult_device_factory.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"
 
 #include "common/StateSaveAreaHeader.h"
 

level_zero/tools/test/unit_tests/sources/sysman/memory/linux/mock_memory.h

@@ -6,13 +6,13 @@
  */
 
 #pragma once
+#include "shared/source/os_interface/linux/i915.h"
 #include "shared/source/os_interface/linux/memory_info.h"
 
 #include "level_zero/core/test/unit_tests/mocks/mock_memory_manager.h"
 #include "level_zero/tools/source/sysman/memory/linux/os_memory_imp.h"
 #include "level_zero/tools/source/sysman/memory/memory_imp.h"
 
-#include "drm/i915_drm.h"
 #include "sysman/linux/os_sysman_imp.h"
 
 using namespace NEO;

opencl/test/unit_test/linux/main_linux_dll.cpp

@@ -12,6 +12,7 @@
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/driver_info.h"
 #include "shared/source/os_interface/linux/allocator_helper.h"
+#include "shared/source/os_interface/linux/i915.h"
 #include "shared/source/os_interface/linux/sys_calls.h"
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/test/common/helpers/custom_event_listener.h"

opencl/test/unit_test/linux/mock_os_layer.cpp

@@ -8,7 +8,9 @@
 #include "mock_os_layer.h"
 
 #include "shared/source/helpers/string.h"
+#include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/linux/drm_wrappers.h"
+#include "shared/source/os_interface/linux/i915.h"
 
 #include <cassert>
 #include <dirent.h>