From ebe8d051dc938a899af2a3e23a67aa1f4b175400 Mon Sep 17 00:00:00 2001
From: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
Date: Sun, 1 May 2022 09:04:42 +0200
Subject: [PATCH] Revert "Enable task count from wait on DG2 and later"

This reverts commit bd6c9a222b31d7a0efecec191304193631960112.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
---
 .../unit_test/helpers/hw_helper_tests_dg2_and_later.cpp     | 6 ------
 shared/source/helpers/hw_helper_dg2_and_later.inl           | 5 -----
 shared/source/helpers/hw_helper_pvc_and_later.inl           | 5 +++++
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp b/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp
index 21481364a9..4fce73117e 100644
--- a/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp
+++ b/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp
@@ -154,12 +154,6 @@ HWTEST2_F(HwHelperTestsDg2AndLater, givenXeHPGAndLaterPlatformWhenCheckingIfUnTy
     EXPECT_TRUE(hwHelper.unTypedDataPortCacheFlushRequired());
 }
 
-HWTEST2_F(HwHelperTestsDg2AndLater, givenHwHelperWhenCheckIsUpdateTaskCountFromWaitSupportedThenReturnsTrue, IsAtLeastXeHpgCore) {
-    auto &hwHelper = HwHelper::get(hardwareInfo.platform.eRenderCoreFamily);
-
-    EXPECT_TRUE(hwHelper.isUpdateTaskCountFromWaitSupported());
-}
-
 using HwInfoConfigTestDg2AndLater = ::testing::Test;
 
 HWTEST2_F(HwInfoConfigTestDg2AndLater, givenDg2AndLaterPlatformWhenAskedIfHeapInLocalMemThenTrueIsReturned, IsAtLeastXeHpgCore) {
diff --git a/shared/source/helpers/hw_helper_dg2_and_later.inl b/shared/source/helpers/hw_helper_dg2_and_later.inl
index f708856def..3caef5fa1b 100644
--- a/shared/source/helpers/hw_helper_dg2_and_later.inl
+++ b/shared/source/helpers/hw_helper_dg2_and_later.inl
@@ -11,11 +11,6 @@
 
 namespace NEO {
 
-template <>
-bool HwHelperHw<Family>::isUpdateTaskCountFromWaitSupported() const {
-    return true;
-}
-
 template <typename GfxFamily>
 inline void MemorySynchronizationCommands<GfxFamily>::setPipeControlExtraProperties(PIPE_CONTROL &pipeControl, PipeControlArgs &args) {
     pipeControl.setHdcPipelineFlush(args.hdcPipelineFlush);
diff --git a/shared/source/helpers/hw_helper_pvc_and_later.inl b/shared/source/helpers/hw_helper_pvc_and_later.inl
index 590f871c59..9cc5901844 100644
--- a/shared/source/helpers/hw_helper_pvc_and_later.inl
+++ b/shared/source/helpers/hw_helper_pvc_and_later.inl
@@ -36,6 +36,11 @@ bool HwHelperHw<Family>::isCooperativeDispatchSupported(const EngineGroupType en
     return true;
 }
 
+template <>
+bool HwHelperHw<Family>::isUpdateTaskCountFromWaitSupported() const {
+    return true;
+}
+
 template <>
 uint32_t HwHelperHw<Family>::adjustMaxWorkGroupCount(uint32_t maxWorkGroupCount, const EngineGroupType engineGroupType,
                                                      const HardwareInfo &hwInfo, bool isEngineInstanced) const {