refactor: cleanup includes

Signed-off-by: Jaroslaw Warchulski <jaroslaw.warchulski@intel.com>

shared/source/os_interface/linux/drm_neo.cpp

@@ -28,7 +28,6 @@
 #include "shared/source/os_interface/linux/cache_info.h"
 #include "shared/source/os_interface/linux/drm_buffer_object.h"
 #include "shared/source/os_interface/linux/drm_engine_mapper.h"
-#include "shared/source/os_interface/linux/drm_gem_close_worker.h"
 #include "shared/source/os_interface/linux/drm_memory_manager.h"
 #include "shared/source/os_interface/linux/drm_memory_operations_handler_bind.h"
 #include "shared/source/os_interface/linux/drm_wrappers.h"
@@ -46,7 +45,6 @@
 #include "shared/source/os_interface/os_environment.h"
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/source/os_interface/product_helper.h"
-#include "shared/source/release_helper/release_helper.h"
 #include "shared/source/utilities/api_intercept.h"
 #include "shared/source/utilities/cpu_info.h"
 #include "shared/source/utilities/directory.h"
@@ -888,11 +886,11 @@ void Drm::setNewResourceBoundToVM(BufferObject *bo, uint32_t vmHandleId) {
 PhysicalDevicePciBusInfo Drm::getPciBusInfo() const {
     PhysicalDevicePciBusInfo pciBusInfo(PhysicalDevicePciBusInfo::invalidValue, PhysicalDevicePciBusInfo::invalidValue, PhysicalDevicePciBusInfo::invalidValue, PhysicalDevicePciBusInfo::invalidValue);
 
-    if (adapterBDF.Data != std::numeric_limits<uint32_t>::max()) {
+    if (adapterBDF.data != std::numeric_limits<uint32_t>::max()) {
         pciBusInfo.pciDomain = this->pciDomain;
-        pciBusInfo.pciBus = adapterBDF.Bus;
-        pciBusInfo.pciDevice = adapterBDF.Device;
-        pciBusInfo.pciFunction = adapterBDF.Function;
+        pciBusInfo.pciBus = adapterBDF.bus;
+        pciBusInfo.pciDevice = adapterBDF.device;
+        pciBusInfo.pciFunction = adapterBDF.function;
     }
     return pciBusInfo;
 }
@@ -911,22 +909,22 @@ int Drm::queryAdapterBDF() {
     uint8_t bus = -1, device = -1, function = -1;
 
     if (NEO::parseBdfString(hwDeviceId->getPciPath(), domain, bus, device, function) != pciBusInfoTokensNum) {
-        adapterBDF.Data = std::numeric_limits<uint32_t>::max();
+        adapterBDF.data = std::numeric_limits<uint32_t>::max();
         return 1;
     }
     setPciDomain(domain);
-    adapterBDF.Bus = bus;
-    adapterBDF.Function = function;
-    adapterBDF.Device = device;
+    adapterBDF.bus = bus;
+    adapterBDF.function = function;
+    adapterBDF.device = device;
     return 0;
 }
 
 void Drm::setGmmInputArgs(void *args) {
     auto gmmInArgs = reinterpret_cast<GMM_INIT_IN_ARGS *>(args);
 #if defined(__linux__)
-    gmmInArgs->FileDescriptor = adapterBDF.Data;
+    gmmInArgs->FileDescriptor = adapterBDF.data;
 #else
-    gmmInArgs->stAdapterBDF = adapterBDF;
+    gmmInArgs->stAdapterBDF.Data = adapterBDF.data;
 #endif
     gmmInArgs->ClientType = GMM_CLIENT::GMM_OCL_VISTA;
 }

shared/source/os_interface/linux/drm_neo.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "shared/source/gmm_helper/gmm_lib.h"
+#include "shared/source/gmm_helper/adapter_bdf.h"
 #include "shared/source/helpers/driver_model_type.h"
 #include "shared/source/memory_manager/definitions/engine_limits.h"
 #include "shared/source/os_interface/linux/drm_debug.h"
@@ -14,6 +14,8 @@
 #include "shared/source/os_interface/linux/hw_device_id.h"
 #include "shared/source/os_interface/os_interface.h"
 
+#include "neo_igfxfmid.h"
+
 #include <array>
 #include <atomic>
 #include <cstdint>
@@ -22,10 +24,9 @@
 #include <mutex>
 #include <string>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
-struct GT_SYSTEM_INFO;
-
 namespace aub_stream {
 enum EngineType : uint32_t;
 }
@@ -318,7 +319,7 @@ class Drm : public DriverModel {
 #pragma pack()
 
     GemContextParamSseu sseu{};
-    ADAPTER_BDF adapterBDF{};
+    AdapterBdf adapterBDF{};
     uint32_t pciDomain = 0;
 
     struct IoctlStatisticsEntry {

shared/source/os_interface/windows/hw_device_id.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,10 +8,9 @@
 #pragma once
 #include "shared/source/helpers/driver_model_type.h"
 #include "shared/source/os_interface/os_interface.h"
+#include "shared/source/os_interface/windows/d3dkmthk_wrapper.h"
 #include "shared/source/os_interface/windows/windows_wrapper.h"
 
-#include <d3dkmthk.h>
-
 #include <memory>
 
 namespace NEO {

shared/source/os_interface/windows/wddm/set_gmm_input_args_wddm.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2021-2024 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
+#include "shared/source/gmm_helper/gmm_lib.h"
 #include "shared/source/os_interface/windows/wddm/wddm.h"
 
 namespace NEO {
@@ -18,7 +18,7 @@ void Wddm::setGmmInputArgs(void *args) {
     gmmInArgs->pSkuTable = gfxFeatureTable.get();
     gmmInArgs->pWaTable = gfxWorkaroundTable.get();
 
-    gmmInArgs->stAdapterBDF = this->adapterBDF;
+    gmmInArgs->stAdapterBDF.Data = this->adapterBDF.data;
     gmmInArgs->ClientType = GMM_CLIENT::GMM_OCL_VISTA;
     gmmInArgs->DeviceRegistryPath = deviceRegistryPath.c_str();
 }

shared/source/os_interface/windows/wddm/wddm.cpp

@@ -1416,10 +1416,10 @@ void Wddm::createPagingFenceLogger() {
 }
 
 PhysicalDevicePciBusInfo Wddm::getPciBusInfo() const {
-    if (adapterBDF.Data == std::numeric_limits<uint32_t>::max()) {
+    if (adapterBDF.data == std::numeric_limits<uint32_t>::max()) {
         return PhysicalDevicePciBusInfo(PhysicalDevicePciBusInfo::invalidValue, PhysicalDevicePciBusInfo::invalidValue, PhysicalDevicePciBusInfo::invalidValue, PhysicalDevicePciBusInfo::invalidValue);
     }
-    return PhysicalDevicePciBusInfo(0, adapterBDF.Bus, adapterBDF.Device, adapterBDF.Function);
+    return PhysicalDevicePciBusInfo(0, adapterBDF.bus, adapterBDF.device, adapterBDF.function);
 }
 
 PhysicalDevicePciSpeedInfo Wddm::getPciSpeedInfo() const {

shared/source/os_interface/windows/wddm/wddm.h

@@ -8,7 +8,7 @@
 #pragma once
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
-#include "shared/source/gmm_helper/gmm_lib.h"
+#include "shared/source/gmm_helper/adapter_bdf.h"
 #include "shared/source/os_interface/windows/hw_device_id.h"
 #include "shared/source/os_interface/windows/sharedata_wrapper.h"
 #include "shared/source/os_interface/windows/wddm/wddm_defs.h"
@@ -275,7 +275,7 @@ class Wddm : public DriverModel {
     WddmResidencyController residencyController;
 
     GMM_GFX_PARTITIONING gfxPartition{};
-    ADAPTER_BDF adapterBDF{};
+    AdapterBdf adapterBDF{};
 
     std::string deviceRegistryPath;