From 9f633e33591277f4be41ed228bb2ed96aa90e3f9 Mon Sep 17 00:00:00 2001
From: Adam Cetnerowski <adam.cetnerowski@intel.com>
Date: Tue, 17 Sep 2019 14:46:10 +0200
Subject: [PATCH] Disable VME on BDW

Change-Id: I9a76f2c7d97254aa6b71e1be44fb1ac5317f37ea
Signed-off-by: Adam Cetnerowski <adam.cetnerowski@intel.com>
---
 platforms.cmake                                 |  1 -
 runtime/gen8/hw_info_bdw.inl                    |  2 +-
 unit_tests/gen8/bdw/test_hw_info_config_bdw.cpp | 10 ++++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/platforms.cmake b/platforms.cmake
index 21d93bce6a..90c01d39b0 100644
--- a/platforms.cmake
+++ b/platforms.cmake
@@ -196,7 +196,6 @@ if(SUPPORT_GEN8)
   if(SUPPORT_BDW)
     ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN8" "BDW" "CORE")
     ADD_PLATFORM_FOR_GEN("SUPPORTED_2_0" "GEN8" "BDW" "CORE")
-    ADD_PLATFORM_FOR_GEN("SUPPORTED_VME" "GEN8" "BDW" "CORE")
     if(TESTS_BDW)
       ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN8" "BDW")
       ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED_APPVERIFIER" "GEN8" "BDW")
diff --git a/runtime/gen8/hw_info_bdw.inl b/runtime/gen8/hw_info_bdw.inl
index 5d30ddf0a7..dbdfb28fb9 100644
--- a/runtime/gen8/hw_info_bdw.inl
+++ b/runtime/gen8/hw_info_bdw.inl
@@ -68,7 +68,7 @@ const RuntimeCapabilityTable BDW::capabilityTable{
     true,                                          // forceStatelessCompilationFor32Bit
     "core",                                        // platformType
     false,                                         // sourceLevelDebuggerSupported
-    true,                                          // supportsVme
+    false,                                         // supportsVme
     false,                                         // supportCacheFlushAfterWalker
     true,                                          // supportsImages
     true                                           // supportsDeviceEnqueue
diff --git a/unit_tests/gen8/bdw/test_hw_info_config_bdw.cpp b/unit_tests/gen8/bdw/test_hw_info_config_bdw.cpp
index 28f996d03a..05b996229a 100644
--- a/unit_tests/gen8/bdw/test_hw_info_config_bdw.cpp
+++ b/unit_tests/gen8/bdw/test_hw_info_config_bdw.cpp
@@ -100,3 +100,13 @@ BDWTEST_F(BdwHwInfo, givenBoolWhenCallBdwHardwareInfoSetupThenFeatureTableAndWor
         }
     }
 }
+
+BDWTEST_F(BdwHwInfo, givenHwInfoConfigStringThenAfterSetupResultingVmeIsDisabled) {
+    HardwareInfo hwInfo;
+
+    std::string strConfig = "default";
+    hardwareInfoSetup[productFamily](&hwInfo, false, strConfig);
+    EXPECT_FALSE(hwInfo.capabilityTable.ftrSupportsVmeAvcTextureSampler);
+    EXPECT_FALSE(hwInfo.capabilityTable.ftrSupportsVmeAvcPreemption);
+    EXPECT_FALSE(hwInfo.capabilityTable.supportsVme);
+}
\ No newline at end of file