Fix svm size programming.

MichalMrozek · Compute-Runtime-Automation · commit 0bb2458dab0a · 2019-10-21T19:32:59.000+02:00
-Base it on max64BitAppAddress.

Change-Id: Id68d12b50b798c5a750a3273963982d4315bd776
Signed-off-by: Michal Mrozek &lt;michal.mrozek@intel.com&gt;
diff --git a/runtime/os_interface/windows/wddm/wddm.cpp b/runtime/os_interface/windows/wddm/wddm.cpp
@@ -959,7 +959,7 @@ bool Wddm::configureDeviceAddressSpaceImpl() {
     if (!hardwareInfoTable[productFamily]) {
         return false;
     }
-    auto svmSize = hardwareInfoTable[productFamily]->capabilityTable.gpuAddressSpace == MemoryConstants::max48BitAddress
+    auto svmSize = hardwareInfoTable[productFamily]->capabilityTable.gpuAddressSpace >= MemoryConstants::max64BitAppAddress
                        ? maximumApplicationAddress + 1u
                        : 0u;
 
diff --git a/unit_tests/os_interface/windows/wddm20_tests.cpp b/unit_tests/os_interface/windows/wddm20_tests.cpp
@@ -503,7 +503,7 @@ HWTEST_F(Wddm20InstrumentationTest, configureDeviceAddressSpaceOnInit) {
     D3DKMT_HANDLE deviceHandle = DEVICE_HANDLE;
     const HardwareInfo hwInfo = *platformDevices[0];
     BOOLEAN FtrL3IACoherency = hwInfo.featureTable.ftrL3IACoherency ? 1 : 0;
-    uintptr_t maxAddr = hwInfo.capabilityTable.gpuAddressSpace == MemoryConstants::max48BitAddress
+    uintptr_t maxAddr = hwInfo.capabilityTable.gpuAddressSpace >= MemoryConstants::max64BitAppAddress
                             ? reinterpret_cast<uintptr_t>(sysInfo.lpMaximumApplicationAddress) + 1
                             : 0;
     EXPECT_CALL(*gmmMem, configureDeviceAddressSpace(adapterHandle,

Original file line number	Diff line number	Diff line change
`@@ -959,7 +959,7 @@ bool Wddm::configureDeviceAddressSpaceImpl() {`
`959`	`959`	`if (!hardwareInfoTable[productFamily]) {`
`960`	`960`	`return false;`
`961`	`961`	`}`
`962`		`- auto svmSize = hardwareInfoTable[productFamily]->capabilityTable.gpuAddressSpace == MemoryConstants::max48BitAddress`
	`962`	`+ auto svmSize = hardwareInfoTable[productFamily]->capabilityTable.gpuAddressSpace >= MemoryConstants::max64BitAppAddress`
`963`	`963`	`? maximumApplicationAddress + 1u`
`964`	`964`	`: 0u;`
`965`	`965`