diff --git a/shared/source/os_interface/linux/drm_neo.cpp b/shared/source/os_interface/linux/drm_neo.cpp index d02e594449..2df251e11a 100644 --- a/shared/source/os_interface/linux/drm_neo.cpp +++ b/shared/source/os_interface/linux/drm_neo.cpp @@ -1134,9 +1134,7 @@ bool Drm::hasPageFaultSupport() const { bool Drm::hasKmdMigrationSupport() const { const auto &productHelper = this->getRootDeviceEnvironment().getHelper(); - auto kmdMigrationSupported = hasPageFaultSupport() && - this->ioctlHelper->isKmdMigrationSupported() && - productHelper.isKmdMigrationSupported(); + auto kmdMigrationSupported = hasPageFaultSupport() && productHelper.isKmdMigrationSupported(); if (debugManager.flags.UseKmdMigration.get() != -1) { return !!debugManager.flags.UseKmdMigration.get(); diff --git a/shared/source/os_interface/linux/ioctl_helper.h b/shared/source/os_interface/linux/ioctl_helper.h index 7db4850f09..7c810a3e4d 100644 --- a/shared/source/os_interface/linux/ioctl_helper.h +++ b/shared/source/os_interface/linux/ioctl_helper.h @@ -139,7 +139,6 @@ class IoctlHelper { virtual int execBuffer(ExecBuffer *execBuffer, uint64_t completionGpuAddress, TaskCountType counterValue) = 0; virtual bool completionFenceExtensionSupported(const bool isVmBindAvailable) = 0; virtual bool isPageFaultSupported() = 0; - virtual bool isKmdMigrationSupported() = 0; virtual std::unique_ptr createVmControlExtRegion(const std::optional ®ionInstanceClass) = 0; virtual uint32_t getFlagsForVmCreate(bool disableScratch, bool enablePageFault, bool useVmBind) = 0; virtual uint32_t createContextWithAccessCounters(GemContextCreateExt &gcc) = 0; @@ -273,7 +272,6 @@ class IoctlHelperI915 : public IoctlHelper { bool setGpuCpuTimes(TimeStampData *pGpuCpuTime, OSTime *osTime) override; void insertEngineToContextParams(ContextParamEngines<> &contextParamEngines, uint32_t engineId, const EngineClassInstance *engineClassInstance, uint32_t tileId, bool hasVirtualEngines) override; int getTileIdFromGtId(int gtId) const override { return -1; } - bool isKmdMigrationSupported() override { return true; } protected: virtual std::vector translateToMemoryRegions(const std::vector ®ionInfo); 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 2734a574c2..96346b3752 100644 --- a/shared/source/os_interface/linux/xe/ioctl_helper_xe.cpp +++ b/shared/source/os_interface/linux/xe/ioctl_helper_xe.cpp @@ -947,10 +947,10 @@ int IoctlHelperXe::queryDistances(std::vector &queryItems, std::vecto } bool IoctlHelperXe::isPageFaultSupported() { - xeLog(" -> IoctlHelperXe::%s %d\n", __FUNCTION__, supportedFeatures.flags.pageFault == true); + xeLog(" -> IoctlHelperXe::%s %d\n", __FUNCTION__, false); - return supportedFeatures.flags.pageFault; -} + return false; +}; uint32_t IoctlHelperXe::getEuStallFdParameter() { xeLog(" -> IoctlHelperXe::%s\n", __FUNCTION__); diff --git a/shared/source/os_interface/linux/xe/ioctl_helper_xe.h b/shared/source/os_interface/linux/xe/ioctl_helper_xe.h index ca6dabe207..06372870dd 100644 --- a/shared/source/os_interface/linux/xe/ioctl_helper_xe.h +++ b/shared/source/os_interface/linux/xe/ioctl_helper_xe.h @@ -136,7 +136,6 @@ class IoctlHelperXe : public IoctlHelper { int getTileIdFromGtId(int gtId) const override { return gtIdToTileId[gtId]; } - bool isKmdMigrationSupported() override { return false; } protected: static constexpr uint32_t maxContextSetProperties = 4; diff --git a/shared/source/xe2_hpg_core/linux/product_helper_bmg.cpp b/shared/source/xe2_hpg_core/linux/product_helper_bmg.cpp index 5307d86262..e1b8fd7387 100644 --- a/shared/source/xe2_hpg_core/linux/product_helper_bmg.cpp +++ b/shared/source/xe2_hpg_core/linux/product_helper_bmg.cpp @@ -33,16 +33,6 @@ int ProductHelperHw::configureHardwareCustom(HardwareInfo *hwInfo, O return 0; } -template <> -bool ProductHelperHw::isPageFaultSupported() const { - return true; -} - -template <> -bool ProductHelperHw::isKmdMigrationSupported() const { - return true; -} - template <> bool ProductHelperHw::isDisableScratchPagesSupported() const { return true; diff --git a/shared/source/xe2_hpg_core/linux/product_helper_lnl.cpp b/shared/source/xe2_hpg_core/linux/product_helper_lnl.cpp index 470c0be2a5..8c9223a327 100644 --- a/shared/source/xe2_hpg_core/linux/product_helper_lnl.cpp +++ b/shared/source/xe2_hpg_core/linux/product_helper_lnl.cpp @@ -35,19 +35,6 @@ int ProductHelperHw::configureHardwareCustom(HardwareInfo *hwInfo, O return 0; } -template <> -bool ProductHelperHw::isPageFaultSupported() const { - return true; -} - -template <> -bool ProductHelperHw::isKmdMigrationSupported() const { - if (debugManager.flags.UseKmdMigration.get() != -1) { - return !!debugManager.flags.UseKmdMigration.get(); - } - return false; -} - template <> bool ProductHelperHw::isDisableScratchPagesSupported() const { return true; 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 52bd001aec..99a43977b2 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 @@ -11,7 +11,6 @@ #include "shared/source/os_interface/product_helper.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" -#include "shared/test/common/libult/linux/drm_query_mock.h" #include "shared/test/common/mocks/linux/mock_drm_memory_manager.h" #include "shared/test/common/mocks/linux/mock_os_context_linux.h" #include "shared/test/common/mocks/linux/mock_os_time_linux.h" @@ -2597,24 +2596,3 @@ TEST_F(IoctlHelperXeTest, whenQueryDeviceIdAndRevisionThenProperValuesAreSet) { EXPECT_EQ(mockDeviceId, hwInfo->platform.usDeviceID); EXPECT_EQ(mockRevisionId, hwInfo->platform.usRevId); } - -TEST_F(IoctlHelperXeTest, givenUseKmdMigrationSetWhenCallingHasKmdMigrationSupportThenReturnCorrectValue) { - DebugManagerStateRestore restorer; - - auto executionEnvironment = std::make_unique(); - executionEnvironment->rootDeviceEnvironments[0]->initGmm(); - executionEnvironment->initializeMemoryManager(); - - DrmQueryMock drm(*executionEnvironment->rootDeviceEnvironments[0]); - drm.pageFaultSupported = true; - drm.ioctlHelper.reset(new IoctlHelperXe(drm)); - - for (auto useKmdMigration : {-1, 0, 1}) { - debugManager.flags.UseKmdMigration.set(useKmdMigration); - if (useKmdMigration == -1) { - EXPECT_FALSE(drm.hasKmdMigrationSupport()); - } else { - EXPECT_EQ(useKmdMigration, drm.hasKmdMigrationSupport()); - } - } -} diff --git a/shared/test/unit_test/xe2_hpg_core/bmg/linux/product_helper_tests_bmg_linux.cpp b/shared/test/unit_test/xe2_hpg_core/bmg/linux/product_helper_tests_bmg_linux.cpp index decfb4051e..a5291e2766 100644 --- a/shared/test/unit_test/xe2_hpg_core/bmg/linux/product_helper_tests_bmg_linux.cpp +++ b/shared/test/unit_test/xe2_hpg_core/bmg/linux/product_helper_tests_bmg_linux.cpp @@ -53,16 +53,12 @@ BMGTEST_F(BmgProductHelperLinux, givenProductHelperWhenAskedIfPatIndexProgrammin EXPECT_TRUE(productHelper->isVmBindPatIndexProgrammingSupported()); } -BMGTEST_F(BmgProductHelperLinux, givenProductHelperWhenCheckDirectSubmissionSupportedThenTrueIsReturned) { - EXPECT_TRUE(productHelper->isDirectSubmissionSupported(releaseHelper)); +BMGTEST_F(BmgProductHelperLinux, givenProductHelperWhenAskedIsPageFaultSupportedThenReturnFalse) { + EXPECT_FALSE(productHelper->isPageFaultSupported()); } -BMGTEST_F(BmgProductHelperLinux, givenProductHelperWhenAskedIsPageFaultSupportedThenReturnTrue) { - EXPECT_TRUE(productHelper->isPageFaultSupported()); -} - -BMGTEST_F(BmgProductHelperLinux, givenProductHelperWhenAskedIsKmdMigrationSupportedThenReturnTrue) { - EXPECT_TRUE(productHelper->isKmdMigrationSupported()); +BMGTEST_F(BmgProductHelperLinux, givenProductHelperWhenAskedIsKmdMigrationSupportedThenReturnFalse) { + EXPECT_FALSE(productHelper->isKmdMigrationSupported()); } BMGTEST_F(BmgProductHelperLinux, WhenGtIsSetupThenGtSystemInfoIsCorrect) { diff --git a/shared/test/unit_test/xe2_hpg_core/excludes_xe2_hpg_core.cpp b/shared/test/unit_test/xe2_hpg_core/excludes_xe2_hpg_core.cpp index e37f6cfea8..3cacae0033 100644 --- a/shared/test/unit_test/xe2_hpg_core/excludes_xe2_hpg_core.cpp +++ b/shared/test/unit_test/xe2_hpg_core/excludes_xe2_hpg_core.cpp @@ -36,5 +36,3 @@ HWTEST_EXCLUDE_PRODUCT(CommandEncodeSemaphore, givenIndirectModeSetWhenProgrammi HWTEST_EXCLUDE_PRODUCT(ProductHelperTest, givenBooleanUncachedWhenCallOverridePatIndexThenProperPatIndexIsReturned, IGFX_XE2_HPG_CORE); HWTEST_EXCLUDE_PRODUCT(GfxCoreHelperTest, whenEncodeAdditionalTimestampOffsetsThenNothingEncoded, IGFX_XE2_HPG_CORE); HWTEST_EXCLUDE_PRODUCT(GfxCoreHelperTest, givenGetDeviceTimestampWidthCalledThenReturnCorrectValue, IGFX_XE2_HPG_CORE); -HWTEST_EXCLUDE_PRODUCT(ProductHelperTest, givenProductHelperWhenAskedIfPageFaultIsSupportedThenReturnFalse, IGFX_XE2_HPG_CORE); -HWTEST_EXCLUDE_PRODUCT(ProductHelperTest, givenProductHelperWhenAskedIfKmdMigrationIsSupportedThenReturnFalse, IGFX_XE2_HPG_CORE); diff --git a/shared/test/unit_test/xe2_hpg_core/lnl/linux/product_helper_tests_lnl_linux.cpp b/shared/test/unit_test/xe2_hpg_core/lnl/linux/product_helper_tests_lnl_linux.cpp index 5b61e4df03..4bc92815eb 100644 --- a/shared/test/unit_test/xe2_hpg_core/lnl/linux/product_helper_tests_lnl_linux.cpp +++ b/shared/test/unit_test/xe2_hpg_core/lnl/linux/product_helper_tests_lnl_linux.cpp @@ -52,8 +52,8 @@ LNLTEST_F(LnlProductHelperLinux, givenProductHelperWhenAskedIfPatIndexProgrammin EXPECT_TRUE(productHelper->isVmBindPatIndexProgrammingSupported()); } -LNLTEST_F(LnlProductHelperLinux, givenProductHelperWhenAskedIsPageFaultSupportedThenReturnTrue) { - EXPECT_TRUE(productHelper->isPageFaultSupported()); +LNLTEST_F(LnlProductHelperLinux, givenProductHelperWhenAskedIsPageFaultSupportedThenReturnFalse) { + EXPECT_FALSE(productHelper->isPageFaultSupported()); } LNLTEST_F(LnlProductHelperLinux, givenProductHelperWhenAskedIsKmdMigrationSupportedThenReturnFalse) {