From df164174b49e1644e2931d9d31d00eafdc6739a9 Mon Sep 17 00:00:00 2001
From: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
Date: Fri, 22 Mar 2024 23:25:39 +0100
Subject: [PATCH] Revert "fix: pass FtrTile64Optimization as-is"

This reverts commit 22d08dabc4a747a4bb5ae1cc4d381be727424fa5.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
---
 shared/source/debug_settings/debug_variables_base.inl           | 2 +-
 shared/test/common/test_files/igdrcl.config                     | 2 +-
 .../unit_test/os_interface/windows/os_interface_win_tests.cpp   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/shared/source/debug_settings/debug_variables_base.inl b/shared/source/debug_settings/debug_variables_base.inl
index a24a40d4e4..5a99901def 100644
--- a/shared/source/debug_settings/debug_variables_base.inl
+++ b/shared/source/debug_settings/debug_variables_base.inl
@@ -512,7 +512,7 @@ DECLARE_DEBUG_VARIABLE(int32_t, SignalAllEventPackets, -1, "All packets of event
 DECLARE_DEBUG_VARIABLE(int32_t, EnableBcsSwControlWa, -1, "Enable BCS WA via BCSSWCONTROL MMIO. -1: default, 0: disabled, 1: if src in system mem, 2: if dst in system mem, 3: if src and dst in system mem, 4: always")
 DECLARE_DEBUG_VARIABLE(bool, EnableHostAllocationMemPolicy, false, "Enables Memory Policy for host allocation")
 DECLARE_DEBUG_VARIABLE(int32_t, OverrideHostAllocationMemPolicyMode, -1, "Override Memory Policy mode for host allocation -1: default (use the system configuration), 0: MPOL_DEFAULT, 1: MPOL_PREFERRED, 2: MPOL_BIND, 3: MPOL_INTERLEAVED, 4: MPOL_LOCAL, 5: MPOL_PREFERRED_MANY")
-DECLARE_DEBUG_VARIABLE(int32_t, EnableFtrTile64Optimization, -1, "Control feature Tile64 Optimization flag passed to gmmlib. -1: pass as-is (default), 0: disable flag, 1: enable flag");
+DECLARE_DEBUG_VARIABLE(int32_t, EnableFtrTile64Optimization, 0, "Control feature Tile64 Optimization flag passed to gmmlib. -1: pass as-is, 0: disable flag(default due to NEO-10623), 1: enable flag");
 
 /* IMPLICIT SCALING */
 DECLARE_DEBUG_VARIABLE(int32_t, EnableWalkerPartition, -1, "-1: default, 0: disable, 1: enable, Enables Walker Partitioning via WPARID.")
diff --git a/shared/test/common/test_files/igdrcl.config b/shared/test/common/test_files/igdrcl.config
index a05b6951d2..8b08a6ca7d 100644
--- a/shared/test/common/test_files/igdrcl.config
+++ b/shared/test/common/test_files/igdrcl.config
@@ -594,7 +594,7 @@ EnableWaitOnUserFenceAfterBindAndUnbind = -1
 UseGemCreateExtInAllocateMemoryByKMD = -1
 PrintMmapAndMunMapCalls = -1
 UseLocalPreferredForCacheableBuffers = -1
-EnableFtrTile64Optimization = -1
+EnableFtrTile64Optimization = 0
 ForceTlbFlushWithTaskCountAfterCopy = -1
 ForceSynchronizedDispatchMode = -1
 DirectSubmissionControllerAdjustOnThrottleAndAcLineStatus = -1
diff --git a/shared/test/unit_test/os_interface/windows/os_interface_win_tests.cpp b/shared/test/unit_test/os_interface/windows/os_interface_win_tests.cpp
index 2c053ead7a..dba05eb437 100644
--- a/shared/test/unit_test/os_interface/windows/os_interface_win_tests.cpp
+++ b/shared/test/unit_test/os_interface/windows/os_interface_win_tests.cpp
@@ -119,7 +119,7 @@ TEST_F(OsInterfaceTest, givenEnableFtrTile64OptimizationDebugKeyWhenSetThenPrope
     {
         wddm->gfxFeatureTable->FtrTile64Optimization = 1;
         auto gmmHelper = std::make_unique<GmmHelper>(rootDeviceEnvironment);
-        EXPECT_EQ(1u, passedFtrTable.FtrTile64Optimization);
+        EXPECT_EQ(0u, passedFtrTable.FtrTile64Optimization);
     }
     {
         debugManager.flags.EnableFtrTile64Optimization.set(-1);