intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-04 07:14:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Set allocation's lock state only in lockResource and unlockResource methods

Browse Source 
Change-Id: I60f35801287166f5bdb0dfcd31ff0118c56ec22a
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2019-01-24 11:51:33 +01:00
committed by sys_ocldev
parent 09c62ca44c
commit f332bf369e
20 changed files with 161 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -630,37 +630,37 @@ bool Wddm::openNTHandle(HANDLE handle, WddmAllocation *alloc) {
return true;
}
void *Wddm::lockResource(WddmAllocation *wddmAllocation) {
void *Wddm::lockResource(WddmAllocation &wddmAllocation) {
if (wddmAllocation->needsMakeResidentBeforeLock) {
if (wddmAllocation.needsMakeResidentBeforeLock) {
applyBlockingMakeResident(wddmAllocation);
}
NTSTATUS status = STATUS_UNSUCCESSFUL;
D3DKMT_LOCK2 lock2 = {};
lock2.hAllocation = wddmAllocation->handle;
lock2.hAllocation = wddmAllocation.handle;
lock2.hDevice = this->device;
status = gdi->lock2(&lock2);
DEBUG_BREAK_IF(status != STATUS_SUCCESS);
kmDafListener->notifyLock(featureTable->ftrKmdDaf, adapter, device, wddmAllocation->handle, 0, gdi->escape);
kmDafListener->notifyLock(featureTable->ftrKmdDaf, adapter, device, wddmAllocation.handle, 0, gdi->escape);
return lock2.pData;
}
void Wddm::unlockResource(WddmAllocation *wddmAllocation) {
void Wddm::unlockResource(WddmAllocation &wddmAllocation) {
NTSTATUS status = STATUS_UNSUCCESSFUL;
D3DKMT_UNLOCK2 unlock2 = {};
unlock2.hAllocation = wddmAllocation->handle;
unlock2.hAllocation = wddmAllocation.handle;
unlock2.hDevice = this->device;
status = gdi->unlock2(&unlock2);
DEBUG_BREAK_IF(status != STATUS_SUCCESS);
kmDafListener->notifyUnlock(featureTable->ftrKmdDaf, adapter, device, &wddmAllocation->handle, 1, gdi->escape);
kmDafListener->notifyUnlock(featureTable->ftrKmdDaf, adapter, device, &wddmAllocation.handle, 1, gdi->escape);
}
void Wddm::kmDafLock(WddmAllocation *wddmAllocation) {
@@ -964,27 +964,27 @@ EvictionStatus Wddm::evictAllTemporaryResources() {
return error ? EvictionStatus::FAILED : EvictionStatus::SUCCESS;
}
EvictionStatus Wddm::evictTemporaryResource(WddmAllocation *allocation) {
EvictionStatus Wddm::evictTemporaryResource(WddmAllocation &allocation) {
auto &lock = acquireLock(temporaryResourcesLock);
auto position = std::find(temporaryResources.begin(), temporaryResources.end(), allocation->handle);
auto position = std::find(temporaryResources.begin(), temporaryResources.end(), allocation.handle);
if (position == temporaryResources.end()) {
return EvictionStatus::NOT_APPLIED;
}
*position = temporaryResources.back();
temporaryResources.pop_back();
uint64_t sizeToTrim = 0;
if (!evict(&allocation->handle, 1, sizeToTrim)) {
if (!evict(&allocation.handle, 1, sizeToTrim)) {
return EvictionStatus::FAILED;
}
return EvictionStatus::SUCCESS;
}
void Wddm::applyBlockingMakeResident(WddmAllocation *allocation) {
void Wddm::applyBlockingMakeResident(WddmAllocation &allocation) {
bool madeResident = false;
while (!(madeResident = makeResident(&allocation->handle, 1, false, nullptr))) {
while (!(madeResident = makeResident(&allocation.handle, 1, false, nullptr))) {
if (evictAllTemporaryResources() == EvictionStatus::SUCCESS) {
continue;
}
if (!makeResident(&allocation->handle, 1, false, nullptr)) {
if (!makeResident(&allocation.handle, 1, false, nullptr)) {
DEBUG_BREAK_IF(true);
return;
};
@@ -992,7 +992,7 @@ void Wddm::applyBlockingMakeResident(WddmAllocation *allocation) {
}
DEBUG_BREAK_IF(!madeResident);
auto &lock = acquireLock(temporaryResourcesLock);
temporaryResources.push_back(allocation->handle);
temporaryResources.push_back(allocation.handle);
lock.unlock();
while (currentPagingFenceValue > *getPagingFenceAddress())
;

8
runtime/os_interface/windows/wddm/wddm.h
View File

@@ -74,8 +74,8 @@ class Wddm {
MOCKABLE_VIRTUAL bool destroyAllocations(D3DKMT_HANDLE *handles, uint32_t allocationCount, D3DKMT_HANDLE resourceHandle);
MOCKABLE_VIRTUAL bool openSharedHandle(D3DKMT_HANDLE handle, WddmAllocation *alloc);
bool openNTHandle(HANDLE handle, WddmAllocation *alloc);
MOCKABLE_VIRTUAL void *lockResource(WddmAllocation *wddmAllocation);
MOCKABLE_VIRTUAL void unlockResource(WddmAllocation *wddmAllocation);
MOCKABLE_VIRTUAL void *lockResource(WddmAllocation &wddmAllocation);
MOCKABLE_VIRTUAL void unlockResource(WddmAllocation &wddmAllocation);
MOCKABLE_VIRTUAL void kmDafLock(WddmAllocation *wddmAllocation);
MOCKABLE_VIRTUAL bool isKmDafEnabled() { return featureTable->ftrKmdDaf; };
@@ -152,8 +152,8 @@ class Wddm {
return pagingFenceAddress;
}
MOCKABLE_VIRTUAL EvictionStatus evictAllTemporaryResources();
MOCKABLE_VIRTUAL EvictionStatus evictTemporaryResource(WddmAllocation *allocation);
MOCKABLE_VIRTUAL void applyBlockingMakeResident(WddmAllocation *allocation);
MOCKABLE_VIRTUAL EvictionStatus evictTemporaryResource(WddmAllocation &allocation);
MOCKABLE_VIRTUAL void applyBlockingMakeResident(WddmAllocation &allocation);
MOCKABLE_VIRTUAL std::unique_lock<SpinLock> acquireLock(SpinLock &lock);
protected: