refactor: move product specific ioctl helper creation out of i915 specific code

Related-To: NEO-13527
Signed-off-by: Mateusz Jablonski <[email protected]>

Author: JablonskiMateusz

shared/source/os_interface/linux/drm_neo.cpp

@@ -1091,9 +1091,14 @@ bool Drm::completionFenceSupport() {
 
 void Drm::setupIoctlHelper(const PRODUCT_FAMILY productFamily) {
     if (!this->ioctlHelper) {
-        std::string prelimVersion = "";
-        getPrelimVersion(prelimVersion);
-        this->ioctlHelper = IoctlHelper::getI915Helper(productFamily, prelimVersion, *this);
+        auto productSpecificIoctlHelperCreator = ioctlHelperFactory[productFamily];
+        if (productSpecificIoctlHelperCreator) {
+            this->ioctlHelper = productSpecificIoctlHelperCreator.value()(*this);
+        } else {
+            std::string prelimVersion = "";
+            getPrelimVersion(prelimVersion);
+            this->ioctlHelper = IoctlHelper::getI915Helper(productFamily, prelimVersion, *this);
+        }
         this->ioctlHelper->initialize();
     }
 }

shared/source/os_interface/linux/ioctl_helper.cpp

@@ -26,6 +26,7 @@
 
 namespace NEO {
 
+std::optional<std::function<std::unique_ptr<IoctlHelper>(Drm &drm)>> ioctlHelperFactory[IGFX_MAX_PRODUCT] = {};
 void IoctlHelper::setExternalContext(ExternalCtx *ctx) {
     externalCtx = ctx;
 }

shared/source/os_interface/linux/ioctl_helper.h

@@ -446,4 +446,5 @@ class IoctlHelperPrelim20 : public IoctlHelperI915 {
     uint64_t uuid = 0;
 };
 
+extern std::optional<std::function<std::unique_ptr<IoctlHelper>(Drm &drm)>> ioctlHelperFactory[IGFX_MAX_PRODUCT];
 } // namespace NEO

shared/source/os_interface/linux/ioctl_helper_getter.cpp

@@ -1,27 +1,17 @@
 /*
- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2024 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/execution_environment/root_device_environment.h"
-#include "shared/source/helpers/hw_info.h"
-#include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/linux/ioctl_helper.h"
 
-#include <functional>
 #include <string>
 
 namespace NEO {
 
-std::optional<std::function<std::unique_ptr<IoctlHelper>(Drm &drm)>> ioctlHelperFactory[IGFX_MAX_PRODUCT] = {};
-
 std::unique_ptr<IoctlHelper> IoctlHelper::getI915Helper(const PRODUCT_FAMILY productFamily, const std::string &prelimVersion, Drm &drm) {
-    auto productSpecificIoctlHelperCreator = ioctlHelperFactory[productFamily];
-    if (productSpecificIoctlHelperCreator) {
-        return productSpecificIoctlHelperCreator.value()(drm);
-    }
     if (prelimVersion == "") {
         return std::make_unique<IoctlHelperUpstream>(drm);
     }

shared/source/os_interface/linux/ioctl_helper_getter_upstream.cpp

@@ -1,24 +1,17 @@
 /*
- * Copyright (C) 2022-2023 Intel Corporation
+ * Copyright (C) 2022-2024 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/linux/ioctl_helper.h"
 
-#include <functional>
 #include <memory>
 
 namespace NEO {
-std::optional<std::function<std::unique_ptr<IoctlHelper>(Drm &drm)>> ioctlHelperFactory[IGFX_MAX_PRODUCT] = {};
 
 std::unique_ptr<IoctlHelper> IoctlHelper::getI915Helper(const PRODUCT_FAMILY productFamily, const std::string &prelimVersion, Drm &drm) {
-    auto productSpecificIoctlHelperCreator = ioctlHelperFactory[productFamily];
-    if (productSpecificIoctlHelperCreator) {
-        return productSpecificIoctlHelperCreator.value()(drm);
-    }
     return std::make_unique<IoctlHelperUpstream>(drm);
 }
 

shared/source/os_interface/linux/local/dg1/enable_ioctl_helper_dg1.cpp

@@ -1,16 +1,13 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2024 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/os_interface/linux/ioctl_helper.h"
 
-#include <functional>
-
 namespace NEO {
-extern std::optional<std::function<std::unique_ptr<IoctlHelper>(Drm &drm)>> ioctlHelperFactory[IGFX_MAX_PRODUCT];
 
 struct EnableProductIoctlHelperDg1 {
     EnableProductIoctlHelperDg1() {