diff --git a/shared/source/direct_submission/direct_submission_properties.h b/shared/source/direct_submission/direct_submission_properties.h index 45a47c89cc..69ecb90c77 100644 --- a/shared/source/direct_submission/direct_submission_properties.h +++ b/shared/source/direct_submission/direct_submission_properties.h @@ -17,7 +17,6 @@ struct DirectSubmissionProperties { bool submitOnInit = false; bool useNonDefault = false; bool useRootDevice = false; - bool useInternal = false; bool operator==(const DirectSubmissionProperties &) const = default; }; diff --git a/shared/source/os_interface/os_context.cpp b/shared/source/os_interface/os_context.cpp index a10075c864..138c5efe50 100644 --- a/shared/source/os_interface/os_context.cpp +++ b/shared/source/os_interface/os_context.cpp @@ -88,7 +88,7 @@ bool OsContext::isDirectSubmissionAvailable(const HardwareInfo &hwInfo, bool &su startDirect = false; } if (this->isInternalEngine()) { - startDirect = directSubmissionProperty.useInternal; + startDirect = false; } if (this->isRootDevice()) { startDirect = directSubmissionProperty.useRootDevice; diff --git a/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp b/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp index 296802e011..bc700d7cc3 100644 --- a/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp +++ b/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp @@ -1305,7 +1305,6 @@ HWTEST_F(InitDirectSubmissionTest, givenInternalContextWhenDirectSubmissionDisab auto hwInfo = device->getRootDeviceEnvironment().getMutableHardwareInfo(); hwInfo->capabilityTable.directSubmissionEngines.data[aub_stream::ENGINE_RCS].engineSupported = true; - hwInfo->capabilityTable.directSubmissionEngines.data[aub_stream::ENGINE_RCS].useInternal = false; hwInfo->capabilityTable.directSubmissionEngines.data[aub_stream::ENGINE_RCS].submitOnInit = false; csr->setupContext(*osContext); @@ -1317,27 +1316,6 @@ HWTEST_F(InitDirectSubmissionTest, givenInternalContextWhenDirectSubmissionDisab csr.reset(); } -HWTEST_F(InitDirectSubmissionTest, givenInternalContextWhenDirectSubmissionEnabledOnInternalThenExpectFeatureAvailable) { - auto csr = std::make_unique>(*device->executionEnvironment, device->getRootDeviceIndex(), device->getDeviceBitfield()); - std::unique_ptr osContext(OsContext::create(device->getExecutionEnvironment()->rootDeviceEnvironments[0]->osInterface.get(), device->getRootDeviceIndex(), 0, - EngineDescriptorHelper::getDefaultDescriptor({aub_stream::ENGINE_RCS, EngineUsage::internal}, PreemptionMode::ThreadGroup, - device->getDeviceBitfield()))); - osContext->ensureContextInitialized(false); - - auto hwInfo = device->getRootDeviceEnvironment().getMutableHardwareInfo(); - hwInfo->capabilityTable.directSubmissionEngines.data[aub_stream::ENGINE_RCS].engineSupported = true; - hwInfo->capabilityTable.directSubmissionEngines.data[aub_stream::ENGINE_RCS].useInternal = true; - hwInfo->capabilityTable.directSubmissionEngines.data[aub_stream::ENGINE_RCS].submitOnInit = false; - - csr->setupContext(*osContext); - csr->initializeTagAllocation(); - bool ret = csr->initDirectSubmission(); - EXPECT_TRUE(ret); - EXPECT_TRUE(csr->isDirectSubmissionEnabled()); - - csr.reset(); -} - HWTEST_F(InitDirectSubmissionTest, givenRootDeviceContextWhenDirectSubmissionDisabledOnRootDeviceThenExpectFeatureNotAvailable) { auto csr = std::make_unique>(*device->executionEnvironment, device->getRootDeviceIndex(), device->getDeviceBitfield()); std::unique_ptr osContext(OsContext::create(device->getExecutionEnvironment()->rootDeviceEnvironments[0]->osInterface.get(), device->getRootDeviceIndex(), 0, diff --git a/shared/test/unit_test/xe2_hpg_core/bmg/hw_info_tests_bmg.cpp b/shared/test/unit_test/xe2_hpg_core/bmg/hw_info_tests_bmg.cpp index e21ece3db5..3631ce2a16 100644 --- a/shared/test/unit_test/xe2_hpg_core/bmg/hw_info_tests_bmg.cpp +++ b/shared/test/unit_test/xe2_hpg_core/bmg/hw_info_tests_bmg.cpp @@ -97,7 +97,6 @@ BMGTEST_F(BmgHwInfoTest, whenCheckDirectSubmissionEnginesThenProperValuesAreSetT EXPECT_FALSE(directSubmissionEngines.data[i].submitOnInit); EXPECT_FALSE(directSubmissionEngines.data[i].useNonDefault); EXPECT_TRUE(directSubmissionEngines.data[i].useRootDevice); - EXPECT_FALSE(directSubmissionEngines.data[i].useInternal); break; case aub_stream::ENGINE_CCS1: case aub_stream::ENGINE_BCS: @@ -105,14 +104,12 @@ BMGTEST_F(BmgHwInfoTest, whenCheckDirectSubmissionEnginesThenProperValuesAreSetT EXPECT_FALSE(directSubmissionEngines.data[i].submitOnInit); EXPECT_TRUE(directSubmissionEngines.data[i].useNonDefault); EXPECT_TRUE(directSubmissionEngines.data[i].useRootDevice); - EXPECT_FALSE(directSubmissionEngines.data[i].useInternal); break; default: EXPECT_FALSE(directSubmissionEngines.data[i].engineSupported); EXPECT_FALSE(directSubmissionEngines.data[i].submitOnInit); EXPECT_FALSE(directSubmissionEngines.data[i].useNonDefault); EXPECT_FALSE(directSubmissionEngines.data[i].useRootDevice); - EXPECT_FALSE(directSubmissionEngines.data[i].useInternal); } } } diff --git a/shared/test/unit_test/xe2_hpg_core/lnl/hw_info_tests_lnl.cpp b/shared/test/unit_test/xe2_hpg_core/lnl/hw_info_tests_lnl.cpp index 33e9f0ad3b..d992f7b722 100644 --- a/shared/test/unit_test/xe2_hpg_core/lnl/hw_info_tests_lnl.cpp +++ b/shared/test/unit_test/xe2_hpg_core/lnl/hw_info_tests_lnl.cpp @@ -96,14 +96,12 @@ LNLTEST_F(LnlHwInfoTest, whenCheckDirectSubmissionEnginesThenProperValuesAreSetT EXPECT_FALSE(directSubmissionEngines.data[i].submitOnInit); EXPECT_FALSE(directSubmissionEngines.data[i].useNonDefault); EXPECT_TRUE(directSubmissionEngines.data[i].useRootDevice); - EXPECT_FALSE(directSubmissionEngines.data[i].useInternal); break; default: EXPECT_FALSE(directSubmissionEngines.data[i].engineSupported); EXPECT_FALSE(directSubmissionEngines.data[i].submitOnInit); EXPECT_FALSE(directSubmissionEngines.data[i].useNonDefault); EXPECT_FALSE(directSubmissionEngines.data[i].useRootDevice); - EXPECT_FALSE(directSubmissionEngines.data[i].useInternal); } } } diff --git a/shared/test/unit_test/xe3_core/ptl/hw_info_tests_ptl.cpp b/shared/test/unit_test/xe3_core/ptl/hw_info_tests_ptl.cpp index 08035876ef..d56d573007 100644 --- a/shared/test/unit_test/xe3_core/ptl/hw_info_tests_ptl.cpp +++ b/shared/test/unit_test/xe3_core/ptl/hw_info_tests_ptl.cpp @@ -89,21 +89,18 @@ PTLTEST_F(PtlHwInfoTest, whenCheckDirectSubmissionEnginesThenProperValuesAreSetT EXPECT_FALSE(directSubmissionEngines.data[i].submitOnInit); EXPECT_FALSE(directSubmissionEngines.data[i].useNonDefault); EXPECT_TRUE(directSubmissionEngines.data[i].useRootDevice); - EXPECT_FALSE(directSubmissionEngines.data[i].useInternal); break; case aub_stream::ENGINE_BCS: EXPECT_TRUE(directSubmissionEngines.data[i].engineSupported); EXPECT_FALSE(directSubmissionEngines.data[i].submitOnInit); EXPECT_TRUE(directSubmissionEngines.data[i].useNonDefault); EXPECT_TRUE(directSubmissionEngines.data[i].useRootDevice); - EXPECT_FALSE(directSubmissionEngines.data[i].useInternal); break; default: EXPECT_FALSE(directSubmissionEngines.data[i].engineSupported); EXPECT_FALSE(directSubmissionEngines.data[i].submitOnInit); EXPECT_FALSE(directSubmissionEngines.data[i].useNonDefault); EXPECT_FALSE(directSubmissionEngines.data[i].useRootDevice); - EXPECT_FALSE(directSubmissionEngines.data[i].useInternal); } } } diff --git a/shared/test/unit_test/xe_hpg_core/os_agnostic_product_helper_xe_lpg_tests.cpp b/shared/test/unit_test/xe_hpg_core/os_agnostic_product_helper_xe_lpg_tests.cpp index d58725394a..370efbdd8c 100644 --- a/shared/test/unit_test/xe_hpg_core/os_agnostic_product_helper_xe_lpg_tests.cpp +++ b/shared/test/unit_test/xe_hpg_core/os_agnostic_product_helper_xe_lpg_tests.cpp @@ -66,14 +66,12 @@ HWTEST2_F(XeLpgHwInfoTests, whenCheckDirectSubmissionEnginesThenProperValuesAreS EXPECT_FALSE(directSubmissionEngines.data[i].submitOnInit); EXPECT_FALSE(directSubmissionEngines.data[i].useNonDefault); EXPECT_TRUE(directSubmissionEngines.data[i].useRootDevice); - EXPECT_FALSE(directSubmissionEngines.data[i].useInternal); break; default: EXPECT_FALSE(directSubmissionEngines.data[i].engineSupported); EXPECT_FALSE(directSubmissionEngines.data[i].submitOnInit); EXPECT_FALSE(directSubmissionEngines.data[i].useNonDefault); EXPECT_FALSE(directSubmissionEngines.data[i].useRootDevice); - EXPECT_FALSE(directSubmissionEngines.data[i].useInternal); } } }