Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fail create allocation if map is unsuccessful.

Browse Source 
- This way we will fail whenever mapping is unsuccessful instead of creating
Graphics Allocation that is in undefined state.

Change-Id: I50358d4564cd3fba0f6d05ab47cbbbaffbd9ce1c
This commit is contained in:
Mrozek, Michal
2019-06-18 13:53:14 +02:00
committed by sys_ocldev
parent 52e3f12b69
commit d6dd229543
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/os_interface/windows/wddm/wddm.cpp
View File

@ -487,14 +487,16 @@ NTSTATUS Wddm::createAllocationsAndMapGpuVa(OsHandleStorage &osHandles) {
} }
osHandles.fragmentStorageData[allocationIndex].osHandleStorage->handle = AllocationInfo[i].hAllocation; osHandles.fragmentStorageData[allocationIndex].osHandleStorage->handle = AllocationInfo[i].hAllocation;
bool success = mapGpuVirtualAddress(&osHandles.fragmentStorageData[allocationIndex]); bool success = mapGpuVirtualAddress(&osHandles.fragmentStorageData[allocationIndex]);
allocationIndex++;
if (!success) { if (!success) {
osHandles.fragmentStorageData[allocationIndex].freeTheFragment = true;
DBG_LOG(PrintDebugMessages, __FUNCTION__, "mapGpuVirtualAddress: ", success); DBG_LOG(PrintDebugMessages, __FUNCTION__, "mapGpuVirtualAddress: ", success);
DEBUG_BREAK_IF(true); DEBUG_BREAK_IF(true);
break; return STATUS_GRAPHICS_NO_VIDEO_MEMORY;
} }
allocationIndex++;
kmDafListener->notifyWriteTarget(featureTable->ftrKmdDaf, adapter, device, AllocationInfo[i].hAllocation, gdi->escape); kmDafListener->notifyWriteTarget(featureTable->ftrKmdDaf, adapter, device, AllocationInfo[i].hAllocation, gdi->escape);
} }

16
unit_tests/os_interface/windows/device_command_stream_tests.cpp
View File

@ -603,6 +603,22 @@ TEST_F(WddmCommandStreamTest, givenGraphicsAllocationWhenMakeResidentThenAllocat
memoryManager->freeGraphicsMemory(gfxAllocation); memoryManager->freeGraphicsMemory(gfxAllocation);
} }
TEST_F(WddmCommandStreamTest, givenHostPtrAllocationWhenMapFailsThenFragmentsAreClearedAndNullptrIsReturned) {
this->wddm->callBaseMapGpuVa = false;
this->wddm->mapGpuVaStatus = false;
void *hostPtr = reinterpret_cast<void *>(wddm->virtualAllocAddress + 0x1234);
auto size = 1234u;
wddm->mapGpuVirtualAddressResult.called = 0u;
wddm->destroyAllocationResult.called = 0u;
auto gfxAllocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{false, size}, hostPtr);
EXPECT_EQ(1u, wddm->mapGpuVirtualAddressResult.called);
EXPECT_EQ(1u, wddm->destroyAllocationResult.called);
EXPECT_EQ(nullptr, gfxAllocation);
}
TEST_F(WddmCommandStreamTest, givenHostPtrWhenPtrBelowRestrictionThenCreateAllocationAndMakeResident) { TEST_F(WddmCommandStreamTest, givenHostPtrWhenPtrBelowRestrictionThenCreateAllocationAndMakeResident) {
void *hostPtr = reinterpret_cast<void *>(memoryManager->getAlignedMallocRestrictions()->minAddress - 0x1000); void *hostPtr = reinterpret_cast<void *>(memoryManager->getAlignedMallocRestrictions()->minAddress - 0x1000);
auto size = 0x2000u; auto size = 0x2000u;