Revert "fix: Dont enable scratch pages when debugger is on"

This reverts commit 18d04b2.

Signed-off-by: Compute-Runtime-Validation <[email protected]>

Author: Compute-Runtime-Validation

shared/source/os_interface/linux/drm_neo.cpp

@@ -1153,9 +1153,9 @@ void Drm::configureScratchPagePolicy() {
         disableScratch = !!debugManager.flags.DisableScratchPages.get();
         return;
     }
-
     const auto &productHelper = this->getRootDeviceEnvironment().getHelper<ProductHelper>();
-    disableScratch = productHelper.isDisableScratchPagesSupported() || rootDeviceEnvironment.executionEnvironment.isDebuggingEnabled();
+    disableScratch = (productHelper.isDisableScratchPagesSupported() &&
+                      !rootDeviceEnvironment.executionEnvironment.isDebuggingEnabled());
 }
 
 void Drm::configureGpuFaultCheckThreshold() {

shared/test/common/libult/linux/drm_mock.h

@@ -31,7 +31,6 @@ class DrmMock : public Drm {
     using Drm::chunkingMode;
     using Drm::completionFenceSupported;
     using Drm::contextDebugSupported;
-    using Drm::disableScratch;
     using Drm::engineInfo;
     using Drm::engineInfoQueried;
     using Drm::fenceVal;

shared/test/unit_test/os_interface/linux/drm_query_prelim_tests.cpp

@@ -309,7 +309,7 @@ TEST(DrmBufferObjectTestPrelim, givenDisableScratchPagesWhenCreateDrmVirtualMemo
     EXPECT_TRUE(drm.receivedGemVmControl.flags & DrmPrelimHelper::getDisableScratchVmCreateFlag());
 }
 
-TEST(DrmBufferObjectPrelim, givenDebuggingEnabledWithoutDisableScratchPagesFlagSetWhenCreateDrmVirtualMemoryThenDisableScratchPagesFlagIsSet) {
+TEST(DrmBufferObjectPrelim, givenDebuggingEnabledWithoutDisableScratchPagesFlagSetWhenCreateDrmVirtualMemoryThenDisableScratchPagesFlagIsNotSet) {
     DebugManagerStateRestore restorer;
     debugManager.flags.UseTileMemoryBankInVirtualMemoryCreation.set(0u);
 
@@ -318,17 +318,16 @@ TEST(DrmBufferObjectPrelim, givenDebuggingEnabledWithoutDisableScratchPagesFlagS
     DrmQueryMock drm{*executionEnvironment->rootDeviceEnvironments[0]};
     drm.configureScratchPagePolicy();
     drm.configureGpuFaultCheckThreshold();
-    EXPECT_TRUE(drm.disableScratch);
 
     uint32_t vmId = 0;
     drm.createDrmVirtualMemory(vmId);
 
-    EXPECT_TRUE(drm.receivedGemVmControl.flags & DrmPrelimHelper::getDisableScratchVmCreateFlag());
+    EXPECT_FALSE(drm.receivedGemVmControl.flags & DrmPrelimHelper::getDisableScratchVmCreateFlag());
 }
 
-TEST(DrmBufferObjectTestPrelim, givenDisableScratchPagesDebugKeyOffAndDebuggingEnabledWhenCreateDrmVirtualMemoryThenEnvVariableIsPriority) {
+TEST(DrmBufferObjectTestPrelim, givenDisableScratchPagesAndDebuggingEnabledWhenCreateDrmVirtualMemoryThenEnvVariableIsPriority) {
     DebugManagerStateRestore restorer;
-    debugManager.flags.DisableScratchPages.set(0);
+    debugManager.flags.DisableScratchPages.set(1);
     debugManager.flags.UseTileMemoryBankInVirtualMemoryCreation.set(0u);
 
     auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();
@@ -340,7 +339,7 @@ TEST(DrmBufferObjectTestPrelim, givenDisableScratchPagesDebugKeyOffAndDebuggingE
     uint32_t vmId = 0;
     drm.createDrmVirtualMemory(vmId);
 
-    EXPECT_FALSE(drm.receivedGemVmControl.flags & DrmPrelimHelper::getDisableScratchVmCreateFlag());
+    EXPECT_TRUE(drm.receivedGemVmControl.flags & DrmPrelimHelper::getDisableScratchVmCreateFlag());
 }
 
 TEST(DrmBufferObjectTestPrelim, givenLocalMemoryDisabledWhenCreateDrmVirtualMemoryThenVmRegionExtensionIsNotPassed) {