Delegate all MemoryManager::getResidencyAllocations() calls through CSR

Change-Id: I9cfbfd86d39b5341598ff2bd8883e13605c58b72
Signed-off-by: Maciej Dziuban <maciej.dziuban@intel.com>
This commit is contained in:
Maciej Dziuban
2018-09-12 09:47:01 +02:00
committed by sys_ocldev
parent 888b067adc
commit fafde2ec15
12 changed files with 38 additions and 42 deletions

View File

@@ -95,7 +95,7 @@ void CommandStreamReceiver::makeNonResident(GraphicsAllocation &gfxAllocation) {
}
void CommandStreamReceiver::makeSurfacePackNonResident(ResidencyContainer *allocationsForResidency) {
auto &residencyAllocations = allocationsForResidency ? *allocationsForResidency : this->getMemoryManager()->getResidencyAllocations();
auto &residencyAllocations = allocationsForResidency ? *allocationsForResidency : this->getResidencyAllocations();
this->waitBeforeMakingNonResidentWhenRequired();
for (auto &surface : residencyAllocations) {

View File

@@ -449,7 +449,7 @@ CompletionStamp CommandStreamReceiverHw<GfxFamily>::flushTask(
} else {
auto commandBuffer = new CommandBuffer(device);
commandBuffer->batchBuffer = batchBuffer;
commandBuffer->surfaces.swap(getMemoryManager()->getResidencyAllocations());
commandBuffer->surfaces.swap(this->getResidencyAllocations());
commandBuffer->batchBufferEndLocation = bbEndLocation;
commandBuffer->taskCount = this->taskCount + 1;
commandBuffer->flushStamp->replaceStampObject(dispatchFlags.flushStampReference);

View File

@@ -124,7 +124,7 @@ void DrmCommandStreamReceiver<GfxFamily>::makeResident(BufferObject *bo) {
template <typename GfxFamily>
void DrmCommandStreamReceiver<GfxFamily>::processResidency(ResidencyContainer *inputAllocationsForResidency, OsContext &osContext) {
auto &allocationsForResidency = inputAllocationsForResidency ? *inputAllocationsForResidency : getMemoryManager()->getResidencyAllocations();
auto &allocationsForResidency = inputAllocationsForResidency ? *inputAllocationsForResidency : this->getResidencyAllocations();
for (uint32_t a = 0; a < allocationsForResidency.size(); a++) {
DrmAllocation *drmAlloc = reinterpret_cast<DrmAllocation *>(allocationsForResidency[a]);
if (drmAlloc->fragmentsStorage.fragmentCount) {

View File

@@ -224,7 +224,7 @@ void WddmCommandStreamReceiver<GfxFamily>::initPageTableManagerRegisters(LinearS
template <typename GfxFamily>
void WddmCommandStreamReceiver<GfxFamily>::kmDafLockAllocations(ResidencyContainer *allocationsForResidency) {
auto &residencyAllocations = allocationsForResidency ? *allocationsForResidency : getMemoryManager()->getResidencyAllocations();
auto &residencyAllocations = allocationsForResidency ? *allocationsForResidency : this->getResidencyAllocations();
for (uint32_t i = 0; i < residencyAllocations.size(); i++) {
auto graphicsAllocation = residencyAllocations[i];