diff --git a/shared/source/os_interface/linux/drm_neo.cpp b/shared/source/os_interface/linux/drm_neo.cpp index d5d9ca7255..d769fdfb8a 100644 --- a/shared/source/os_interface/linux/drm_neo.cpp +++ b/shared/source/os_interface/linux/drm_neo.cpp @@ -1082,8 +1082,7 @@ void Drm::setupIoctlHelper(const PRODUCT_FAMILY productFamily) { if (!this->ioctlHelper) { std::string prelimVersion = ""; getPrelimVersion(prelimVersion); - auto drmVersion = Drm::getDrmVersion(getFileDescriptor()); - this->ioctlHelper = IoctlHelper::get(productFamily, prelimVersion, drmVersion, *this); + this->ioctlHelper = IoctlHelper::getI915Helper(productFamily, prelimVersion, *this); this->ioctlHelper->initialize(); } } diff --git a/shared/source/os_interface/linux/ioctl_helper.h b/shared/source/os_interface/linux/ioctl_helper.h index 892b9e66f1..480bff288a 100644 --- a/shared/source/os_interface/linux/ioctl_helper.h +++ b/shared/source/os_interface/linux/ioctl_helper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -67,7 +67,7 @@ class IoctlHelper { public: IoctlHelper(Drm &drmArg) : drm(drmArg){}; virtual ~IoctlHelper() {} - static std::unique_ptr get(const PRODUCT_FAMILY productFamily, const std::string &prelimVersion, const std::string &drmVersion, Drm &drm); + static std::unique_ptr getI915Helper(const PRODUCT_FAMILY productFamily, const std::string &prelimVersion, Drm &drm); virtual uint32_t ioctl(DrmIoctl request, void *arg); virtual bool initialize() = 0; diff --git a/shared/source/os_interface/linux/ioctl_helper_getter.cpp b/shared/source/os_interface/linux/ioctl_helper_getter.cpp index f8a2c6064b..1e92f95496 100644 --- a/shared/source/os_interface/linux/ioctl_helper_getter.cpp +++ b/shared/source/os_interface/linux/ioctl_helper_getter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -17,7 +17,7 @@ namespace NEO { std::optional(Drm &drm)>> ioctlHelperFactory[IGFX_MAX_PRODUCT] = {}; -std::unique_ptr IoctlHelper::get(const PRODUCT_FAMILY productFamily, const std::string &prelimVersion, const std::string &drmVersion, Drm &drm) { +std::unique_ptr IoctlHelper::getI915Helper(const PRODUCT_FAMILY productFamily, const std::string &prelimVersion, Drm &drm) { auto productSpecificIoctlHelperCreator = ioctlHelperFactory[productFamily]; if (productSpecificIoctlHelperCreator) { return productSpecificIoctlHelperCreator.value()(drm); diff --git a/shared/source/os_interface/linux/ioctl_helper_getter_upstream.cpp b/shared/source/os_interface/linux/ioctl_helper_getter_upstream.cpp index f01a064206..ec7df72479 100644 --- a/shared/source/os_interface/linux/ioctl_helper_getter_upstream.cpp +++ b/shared/source/os_interface/linux/ioctl_helper_getter_upstream.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -14,7 +14,7 @@ namespace NEO { std::optional(Drm &drm)>> ioctlHelperFactory[IGFX_MAX_PRODUCT] = {}; -std::unique_ptr IoctlHelper::get(const PRODUCT_FAMILY productFamily, const std::string &prelimVersion, const std::string &drmVersion, Drm &drm) { +std::unique_ptr IoctlHelper::getI915Helper(const PRODUCT_FAMILY productFamily, const std::string &prelimVersion, Drm &drm) { auto productSpecificIoctlHelperCreator = ioctlHelperFactory[productFamily]; if (productSpecificIoctlHelperCreator) { return productSpecificIoctlHelperCreator.value()(drm); diff --git a/shared/test/unit_test/os_interface/linux/drm_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_tests.cpp index 250bdb9b67..16a422e06d 100644 --- a/shared/test/unit_test/os_interface/linux/drm_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_tests.cpp @@ -1191,7 +1191,7 @@ TEST(DrmTest, givenInvalidUapiPrelimVersionThenFallbackToBasePrelim) { DrmMock drm{*executionEnvironment->rootDeviceEnvironments[0]}; const auto productFamily = defaultHwInfo->platform.eProductFamily; - std::unique_ptr ioctlHelper(IoctlHelper::get(productFamily, "-1", "unk", drm)); + std::unique_ptr ioctlHelper(IoctlHelper::getI915Helper(productFamily, "-1", drm)); EXPECT_NE(nullptr, ioctlHelper.get()); }