diff --git a/opencl/test/unit_test/linux/main_linux_dll.cpp b/opencl/test/unit_test/linux/main_linux_dll.cpp index 9e44ed1e00..6016c5463a 100644 --- a/opencl/test/unit_test/linux/main_linux_dll.cpp +++ b/opencl/test/unit_test/linux/main_linux_dll.cpp @@ -535,14 +535,6 @@ TEST_F(DrmTests, GivenKnownDeviceWhenCreatingDrmThenHwInfoIsProperlySet) { EXPECT_EQ(deviceId, mockRootDeviceEnvironment->getHardwareInfo()->platform.usDeviceID); } -TEST_F(DrmTests, GivenNoSoftPinWhenCreatingDrmThenNullIsReturned) { - VariableBackup backupHaveSoftPin(&haveSoftPin); - haveSoftPin = 0; - - auto drm = DrmWrap::createDrm(*mockRootDeviceEnvironment); - EXPECT_EQ(drm, nullptr); -} - TEST_F(DrmTests, WhenCantFindDeviceIdThenDrmIsNotCreated) { VariableBackup backupFailOnDeviceId(&failOnDeviceId); failOnDeviceId = -1; @@ -575,14 +567,6 @@ TEST_F(DrmTests, WhenCantQueryRevisionIdThenDrmIsNotCreated) { EXPECT_EQ(drm, nullptr); } -TEST_F(DrmTests, WhenCantQuerySoftPinSupportThenDrmIsNotCreated) { - VariableBackup backupFailOnSoftPin(&failOnSoftPin); - failOnSoftPin = -1; - - auto drm = DrmWrap::createDrm(*mockRootDeviceEnvironment); - EXPECT_EQ(drm, nullptr); -} - TEST_F(DrmTests, GivenFailOnParamBoostWhenCreatingDrmThenDrmIsCreated) { VariableBackup backupFailOnParamBoost(&failOnParamBoost); failOnParamBoost = -1; diff --git a/opencl/test/unit_test/linux/mock_os_layer.cpp b/opencl/test/unit_test/linux/mock_os_layer.cpp index f301e691de..167b6cdc89 100644 --- a/opencl/test/unit_test/linux/mock_os_layer.cpp +++ b/opencl/test/unit_test/linux/mock_os_layer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -25,7 +25,6 @@ int fakeFd = 1023; int haveDri = 0; // index of dri to serve, -1 - none int deviceId = NEO::deviceDescriptorTable[0].deviceId; // default supported DeviceID int revisionId = 17; -int haveSoftPin = 1; int havePreemption = I915_SCHEDULER_CAP_ENABLED | I915_SCHEDULER_CAP_PRIORITY | I915_SCHEDULER_CAP_PREEMPTION; @@ -34,7 +33,6 @@ int failOnDeviceId = 0; int failOnEuTotal = 0; int failOnSubsliceTotal = 0; int failOnRevisionId = 0; -int failOnSoftPin = 0; int failOnParamBoost = 0; int failOnSetParamSseu = 0; int failOnGetParamSseu = 0; @@ -156,10 +154,6 @@ int drmGetParam(NEO::GetParam *param) { *param->value = revisionId; ret = failOnRevisionId; break; - case I915_PARAM_HAS_EXEC_SOFTPIN: - *param->value = haveSoftPin; - ret = failOnSoftPin; - break; #if defined(I915_PARAM_HAS_SCHEDULER) case I915_PARAM_HAS_SCHEDULER: *param->value = havePreemption; diff --git a/opencl/test/unit_test/linux/mock_os_layer.h b/opencl/test/unit_test/linux/mock_os_layer.h index b739f79b1d..41ebb2f8fc 100644 --- a/opencl/test/unit_test/linux/mock_os_layer.h +++ b/opencl/test/unit_test/linux/mock_os_layer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -26,13 +26,11 @@ extern int fakeFd; extern int haveDri; // index of dri to serve, -1 - none extern int deviceId; // known DeviceID extern int revisionId; -extern int haveSoftPin; extern int vmId; extern int failOnDeviceId; extern int failOnEuTotal; extern int failOnSubsliceTotal; extern int failOnRevisionId; -extern int failOnSoftPin; extern int failOnParamBoost; extern int failOnContextCreate; extern int failOnVirtualMemoryCreate; diff --git a/shared/source/dll/linux/drm_neo_create.cpp b/shared/source/dll/linux/drm_neo_create.cpp index 45af47ed0d..da54a1464e 100644 --- a/shared/source/dll/linux/drm_neo_create.cpp +++ b/shared/source/dll/linux/drm_neo_create.cpp @@ -63,20 +63,6 @@ Drm *Drm::create(std::unique_ptr &&hwDeviceId, RootDeviceEnvironm return nullptr; } - // Detect device parameters - int hasExecSoftPin = 0; - ret = drm->getExecSoftPin(hasExecSoftPin); - if (ret != 0) { - printDebugString(debugManager.flags.PrintDebugMessages.get(), stderr, "%s", "FATAL: Cannot query Soft Pin parameter!\n"); - return nullptr; - } - - if (!hasExecSoftPin) { - printDebugString(debugManager.flags.PrintDebugMessages.get(), stderr, "%s", - "FATAL: Device doesn't support Soft-Pin but this is required.\n"); - return nullptr; - } - // Activate the Turbo Boost Frequency feature ret = drm->enableTurboBoost(); if (ret != 0) { diff --git a/shared/source/os_interface/linux/drm_neo.cpp b/shared/source/os_interface/linux/drm_neo.cpp index 5faa2b0903..91a9fbca71 100644 --- a/shared/source/os_interface/linux/drm_neo.cpp +++ b/shared/source/os_interface/linux/drm_neo.cpp @@ -166,10 +166,6 @@ int Drm::getParamIoctl(DrmParam param, int *dstValue) { return retVal; } -int Drm::getExecSoftPin(int &execSoftPin) { - return getParamIoctl(DrmParam::paramHasExecSoftpin, &execSoftPin); -} - bool Drm::queryI915DeviceIdAndRevision() { HardwareInfo *hwInfo = rootDeviceEnvironment.getMutableHardwareInfo(); int deviceId = hwInfo->platform.usDeviceID; diff --git a/shared/source/os_interface/linux/drm_neo.h b/shared/source/os_interface/linux/drm_neo.h index cbe3882054..bbb961d5dd 100644 --- a/shared/source/os_interface/linux/drm_neo.h +++ b/shared/source/os_interface/linux/drm_neo.h @@ -82,7 +82,6 @@ class Drm : public DriverModel { return 0; } PhysicalDevicePciSpeedInfo getPciSpeedInfo() const override; - int getExecSoftPin(int &execSoftPin); int enableTurboBoost(); int getEuTotal(int &euTotal); int getSubsliceTotal(int &subsliceTotal); diff --git a/shared/source/os_interface/linux/drm_wrappers.h b/shared/source/os_interface/linux/drm_wrappers.h index e1befb98cc..70664cae4c 100644 --- a/shared/source/os_interface/linux/drm_wrappers.h +++ b/shared/source/os_interface/linux/drm_wrappers.h @@ -300,7 +300,6 @@ enum class DrmParam { mmapOffsetWc, paramChipsetId, paramRevision, - paramHasExecSoftpin, paramHasPooledEu, paramHasScheduler, paramEuTotal, diff --git a/shared/source/os_interface/linux/ioctl_helper_i915.cpp b/shared/source/os_interface/linux/ioctl_helper_i915.cpp index 705abb8739..f7bf4748e8 100644 --- a/shared/source/os_interface/linux/ioctl_helper_i915.cpp +++ b/shared/source/os_interface/linux/ioctl_helper_i915.cpp @@ -136,8 +136,6 @@ int IoctlHelperI915::getDrmParamValueBase(DrmParam drmParam) const { return I915_PARAM_CHIPSET_ID; case DrmParam::paramRevision: return I915_PARAM_REVISION; - case DrmParam::paramHasExecSoftpin: - return I915_PARAM_HAS_EXEC_SOFTPIN; case DrmParam::paramHasPooledEu: return I915_PARAM_HAS_POOLED_EU; case DrmParam::paramHasScheduler: @@ -339,8 +337,6 @@ std::string IoctlHelperI915::getDrmParamString(DrmParam drmParam) const { return "I915_PARAM_CHIPSET_ID"; case DrmParam::paramRevision: return "I915_PARAM_REVISION"; - case DrmParam::paramHasExecSoftpin: - return "I915_PARAM_HAS_EXEC_SOFTPIN"; case DrmParam::paramHasPooledEu: return "I915_PARAM_HAS_POOLED_EU"; case DrmParam::paramHasScheduler: diff --git a/shared/source/os_interface/linux/xe/ioctl_helper_xe.cpp b/shared/source/os_interface/linux/xe/ioctl_helper_xe.cpp index b6eb0a80c2..d4ff7ad362 100644 --- a/shared/source/os_interface/linux/xe/ioctl_helper_xe.cpp +++ b/shared/source/os_interface/linux/xe/ioctl_helper_xe.cpp @@ -929,9 +929,6 @@ int IoctlHelperXe::ioctl(DrmIoctl request, void *arg) { case static_cast(DrmParam::paramHasPageFault): *d->value = 0; break; - case static_cast(DrmParam::paramHasExecSoftpin): - *d->value = 1; - break; case static_cast(DrmParam::paramHasScheduler): *d->value = static_cast(0x80000037); break; @@ -1351,8 +1348,6 @@ std::string IoctlHelperXe::getDrmParamString(DrmParam drmParam) const { return "ParamChipsetId"; case DrmParam::paramRevision: return "ParamRevision"; - case DrmParam::paramHasExecSoftpin: - return "ParamHasExecSoftpin"; case DrmParam::paramHasPooledEu: return "ParamHasPooledEu"; case DrmParam::paramHasScheduler: diff --git a/shared/test/common/libult/linux/drm_mock.cpp b/shared/test/common/libult/linux/drm_mock.cpp index 2adaced3cc..68a8864c15 100644 --- a/shared/test/common/libult/linux/drm_mock.cpp +++ b/shared/test/common/libult/linux/drm_mock.cpp @@ -94,10 +94,6 @@ int DrmMock::ioctl(DrmIoctl request, void *arg) { *gp->value = this->storedPreemptionSupport; return this->storedRetVal; } - if (gp->param == I915_PARAM_HAS_EXEC_SOFTPIN) { - *gp->value = this->storedExecSoftPin; - return this->storedRetVal; - } if (gp->param == I915_PARAM_CS_TIMESTAMP_FREQUENCY) { *gp->value = this->storedCsTimestampFrequency; return this->storedRetVal; diff --git a/shared/test/common/libult/linux/drm_mock.h b/shared/test/common/libult/linux/drm_mock.h index 6d6a4a401f..ae204026e5 100644 --- a/shared/test/common/libult/linux/drm_mock.h +++ b/shared/test/common/libult/linux/drm_mock.h @@ -205,7 +205,6 @@ class DrmMock : public Drm { int storedRetValForPersistant = 0; int storedRetValForVmCreate = 0; int storedPreemptionSupport = 0; - int storedExecSoftPin = 0; int storedRetValForVmId = 1; int storedCsTimestampFrequency = 1000; int storedOaTimestampFrequency = 123456; 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 0fd634182b..024ed89683 100644 --- a/shared/test/unit_test/os_interface/linux/drm_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_tests.cpp @@ -481,23 +481,6 @@ TEST(DrmTest, givenDrmPreemptionEnabledAndLowPriorityEngineWhenCreatingOsContext EXPECT_EQ(0u, drmMock.receivedContextParamRequest.size); } -TEST(DrmTest, WhenGettingExecSoftPinThenCorrectValueIsReturned) { - auto executionEnvironment = std::make_unique(); - DrmMock *pDrm = new DrmMock(*executionEnvironment->rootDeviceEnvironments[0]); - int execSoftPin = 0; - - int ret = pDrm->getExecSoftPin(execSoftPin); - EXPECT_EQ(0, ret); - EXPECT_EQ(0, execSoftPin); - - pDrm->storedExecSoftPin = 1; - ret = pDrm->getExecSoftPin(execSoftPin); - EXPECT_EQ(0, ret); - EXPECT_EQ(1, execSoftPin); - - delete pDrm; -} - TEST(DrmTest, WhenEnablingTurboBoostThenSucceeds) { auto executionEnvironment = std::make_unique(); DrmMock *pDrm = new DrmMock(*executionEnvironment->rootDeviceEnvironments[0]); @@ -1594,7 +1577,6 @@ TEST(DrmWrapperTest, WhenGettingDrmParamValueStringThenProperStringIsReturned) { MockIoctlHelper ioctlHelper{drm}; std::map ioctlCodeStringMap = { - {DrmParam::paramHasExecSoftpin, "I915_PARAM_HAS_EXEC_SOFTPIN"}, {DrmParam::paramHasPooledEu, "I915_PARAM_HAS_POOLED_EU"}, {DrmParam::paramHasScheduler, "I915_PARAM_HAS_SCHEDULER"}, {DrmParam::paramEuTotal, "I915_PARAM_EU_TOTAL"}, diff --git a/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_dg1.cpp b/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_dg1.cpp index 33a2e89e01..67c3551e2c 100644 --- a/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_dg1.cpp +++ b/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_dg1.cpp @@ -163,7 +163,6 @@ DG1TEST_F(IoctlHelperTestsDg1, whenGettingDrmParamStringThenProperStringIsReturn auto &ioctlHelper = *drm->getIoctlHelper(); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramChipsetId).c_str(), "I915_PARAM_CHIPSET_ID"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramRevision).c_str(), "I915_PARAM_REVISION"); - EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasExecSoftpin).c_str(), "I915_PARAM_HAS_EXEC_SOFTPIN"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasPooledEu).c_str(), "I915_PARAM_HAS_POOLED_EU"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasScheduler).c_str(), "I915_PARAM_HAS_SCHEDULER"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramEuTotal).c_str(), "I915_PARAM_EU_TOTAL"); diff --git a/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_prelim.cpp b/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_prelim.cpp index 6b73e3ae3c..0b494985f9 100644 --- a/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_prelim.cpp +++ b/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_prelim.cpp @@ -96,7 +96,6 @@ TEST_F(IoctlPrelimHelperTests, whenGettingIoctlRequestValueThenPropertValueIsRet TEST_F(IoctlPrelimHelperTests, whenGettingDrmParamStringThenProperStringIsReturned) { EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramChipsetId).c_str(), "I915_PARAM_CHIPSET_ID"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramRevision).c_str(), "I915_PARAM_REVISION"); - EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasExecSoftpin).c_str(), "I915_PARAM_HAS_EXEC_SOFTPIN"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasPooledEu).c_str(), "I915_PARAM_HAS_POOLED_EU"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasScheduler).c_str(), "I915_PARAM_HAS_SCHEDULER"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramEuTotal).c_str(), "I915_PARAM_EU_TOTAL"); @@ -177,7 +176,6 @@ TEST_F(IoctlPrelimHelperTests, whenGettingDrmParamValueThenPropertValueIsReturne EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::mmapOffsetWc), static_cast(I915_MMAP_OFFSET_WC)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramChipsetId), static_cast(I915_PARAM_CHIPSET_ID)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramRevision), static_cast(I915_PARAM_REVISION)); - EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramHasExecSoftpin), static_cast(I915_PARAM_HAS_EXEC_SOFTPIN)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramHasPooledEu), static_cast(I915_PARAM_HAS_POOLED_EU)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramHasScheduler), static_cast(I915_PARAM_HAS_SCHEDULER)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramEuTotal), static_cast(I915_PARAM_EU_TOTAL)); diff --git a/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp b/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp index 074678e00d..8f3a079c32 100644 --- a/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp +++ b/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp @@ -228,7 +228,6 @@ TEST(IoctlHelperUpstreamTest, whenGettingDrmParamStringThenProperStringIsReturne IoctlHelperUpstream ioctlHelper{*drm}; EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramChipsetId).c_str(), "I915_PARAM_CHIPSET_ID"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramRevision).c_str(), "I915_PARAM_REVISION"); - EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasExecSoftpin).c_str(), "I915_PARAM_HAS_EXEC_SOFTPIN"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasPooledEu).c_str(), "I915_PARAM_HAS_POOLED_EU"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramHasScheduler).c_str(), "I915_PARAM_HAS_SCHEDULER"); EXPECT_STREQ(ioctlHelper.getDrmParamString(DrmParam::paramEuTotal).c_str(), "I915_PARAM_EU_TOTAL"); @@ -268,7 +267,6 @@ TEST(IoctlHelperUpstreamTest, whenGettingDrmParamValueThenPropertValueIsReturned EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::mmapOffsetWc), static_cast(I915_MMAP_OFFSET_WC)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramChipsetId), static_cast(I915_PARAM_CHIPSET_ID)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramRevision), static_cast(I915_PARAM_REVISION)); - EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramHasExecSoftpin), static_cast(I915_PARAM_HAS_EXEC_SOFTPIN)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramHasPooledEu), static_cast(I915_PARAM_HAS_POOLED_EU)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramHasScheduler), static_cast(I915_PARAM_HAS_SCHEDULER)); EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::paramEuTotal), static_cast(I915_PARAM_EU_TOTAL)); diff --git a/shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp b/shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp index 2e34574fae..301d44a6c3 100644 --- a/shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp @@ -362,7 +362,6 @@ TEST(IoctlHelperXeTest, givenIoctlHelperXeWhenCallingAnyMethodThenDummyValueIsRe verifyDrmParamString("MmapOffsetWc", DrmParam::mmapOffsetWc); verifyDrmParamString("ParamChipsetId", DrmParam::paramChipsetId); verifyDrmParamString("ParamRevision", DrmParam::paramRevision); - verifyDrmParamString("ParamHasExecSoftpin", DrmParam::paramHasExecSoftpin); verifyDrmParamString("ParamHasPooledEu", DrmParam::paramHasPooledEu); verifyDrmParamString("ParamHasScheduler", DrmParam::paramHasScheduler); verifyDrmParamString("ParamEuTotal", DrmParam::paramEuTotal); @@ -667,10 +666,6 @@ TEST(IoctlHelperXeTest, whenCallingIoctlThenProperValueIsReturned) { ret = mockXeIoctlHelper->ioctl(DrmIoctl::getparam, &test); EXPECT_EQ(0, ret); EXPECT_EQ(dstvalue, 0); - test.param = static_cast(DrmParam::paramHasExecSoftpin); - ret = mockXeIoctlHelper->ioctl(DrmIoctl::getparam, &test); - EXPECT_EQ(0, ret); - EXPECT_EQ(dstvalue, 1); test.param = static_cast(DrmParam::paramHasScheduler); ret = mockXeIoctlHelper->ioctl(DrmIoctl::getparam, &test); EXPECT_EQ(0, ret);