Revert: Setting the GpuAddress from a fragment in createGraphicsAllocation

Change-Id: Ifd0a26f58b748df5e43e57b4e0be6b94c2051890

Author: andrzejkoska

runtime/os_interface/windows/wddm_memory_manager.cpp

@@ -411,22 +411,9 @@ void WddmMemoryManager::cleanOsHandles(OsHandleStorage &handleStorage) {
     }
 }
 
-void WddmMemoryManager::obtainGpuAddresFromFragments(WddmAllocation *allocation, OsHandleStorage &handleStorage) {
-    if (this->force32bitAllocations && (handleStorage.fragmentCount > 0)) {
-        auto gpuPtr = handleStorage.fragmentStorageData[0].osHandleStorage->gpuPtr;
-        for (uint32_t i = 1; i < handleStorage.fragmentCount; i++) {
-            if (handleStorage.fragmentStorageData[i].osHandleStorage->gpuPtr < gpuPtr) {
-                gpuPtr = handleStorage.fragmentStorageData[i].osHandleStorage->gpuPtr;
-            }
-        }
-        allocation->setGpuAddress(gpuPtr);
-    }
-}
-
 GraphicsAllocation *WddmMemoryManager::createGraphicsAllocation(OsHandleStorage &handleStorage, size_t hostPtrSize, const void *hostPtr) {
     auto allocation = new WddmAllocation(const_cast<void *>(hostPtr), hostPtrSize, const_cast<void *>(hostPtr), hostPtrSize, nullptr);
     allocation->fragmentsStorage = handleStorage;
-    obtainGpuAddresFromFragments(allocation, handleStorage);
     return allocation;
 }
 

runtime/os_interface/windows/wddm_memory_manager.h

@@ -64,8 +64,6 @@ class WddmMemoryManager : public MemoryManager {
     AllocationStatus populateOsHandles(OsHandleStorage &handleStorage) override;
     void cleanOsHandles(OsHandleStorage &handleStorage) override;
 
-    void obtainGpuAddresFromFragments(WddmAllocation *allocation, OsHandleStorage &handleStorage);
-
     GraphicsAllocation *createGraphicsAllocation(OsHandleStorage &handleStorage, size_t hostPtrSize, const void *hostPtr) override;
 
     static const D3DGPU_VIRTUAL_ADDRESS minimumAddress = static_cast<D3DGPU_VIRTUAL_ADDRESS>(0x0);

unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp

@@ -1573,39 +1573,6 @@ HWTEST_F(BufferWithWddmMemory, GivenPointerAndSizeWhenAskedToCreateGrahicsAlloca
     memoryManager->freeGraphicsMemory(allocation);
 }
 
-HWTEST_F(BufferWithWddmMemory, givenFragmentsThatAreNotInOrderWhenGraphicsAllocationIsBeingCreatedThenGraphicsAddressIsPopulatedFromProperFragment) {
-    SetUpMm<FamilyType>();
-    memoryManager->setForce32bitAllocations(true);
-    OsHandleStorage handleStorage;
-    D3DGPU_VIRTUAL_ADDRESS lowestAdress = MemoryConstants::pageSize * 1;
-    D3DGPU_VIRTUAL_ADDRESS higherAdress = MemoryConstants::pageSize * 2;
-
-    auto ptr = reinterpret_cast<void *>(wddm->virtualAllocAddress + MemoryConstants::pageSize * 1);
-    auto ptr2 = reinterpret_cast<void *>(wddm->virtualAllocAddress + MemoryConstants::pageSize * 2);
-    auto size = MemoryConstants::pageSize;
-    OsHandle osHandle1;
-    OsHandle osHandle2;
-    handleStorage.fragmentStorageData[0].cpuPtr = ptr;
-    handleStorage.fragmentStorageData[0].fragmentSize = size;
-    handleStorage.fragmentStorageData[0].osHandleStorage = &osHandle1;
-    handleStorage.fragmentStorageData[0].osHandleStorage->gpuPtr = higherAdress;
-
-    handleStorage.fragmentStorageData[1].cpuPtr = ptr2;
-    handleStorage.fragmentStorageData[1].fragmentSize = size * 2;
-    handleStorage.fragmentStorageData[1].osHandleStorage = &osHandle2;
-    handleStorage.fragmentStorageData[1].osHandleStorage->gpuPtr = lowestAdress;
-    handleStorage.fragmentCount = 2;
-
-    auto allocation = memoryManager->createGraphicsAllocation(handleStorage, size, ptr);
-
-    EXPECT_EQ(ptr, allocation->getUnderlyingBuffer());
-    EXPECT_EQ(size, allocation->getUnderlyingBufferSize());
-    EXPECT_EQ(lowestAdress, allocation->getGpuAddress());
-
-    allocation->fragmentsStorage.fragmentCount = 0;
-    memoryManager->freeGraphicsMemory(allocation);
-}
-
 HWTEST_F(WddmMemoryManagerTest2, makeResidentResidencyAllocationsDoesNotMarkAllocationsResidentWhenMakeResidentFails) {
     SetUpMm<FamilyType>();
     WddmAllocation allocation1, allocation2, allocation3, allocation4;