The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-23 15:31:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid duplicating NvDrv buffer unmap code

Browse Source
This commit is contained in:
Billy Laws 2022-10-30 16:32:49 +00:00
parent 001064b7bf
commit f650f32bf0
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/cpp/skyline/services/nvdrv/devices/nvhost/as_gpu.cpp
View File

@ -149,23 +149,7 @@ namespace skyline::service::nvdrv::device::nvhost {
return PosixResult::InvalidArgument; return PosixResult::InvalidArgument;
try { try {
auto mapping{mappingMap.at(offset)}; FreeMappingLocked(offset);
if (!mapping->fixed) {
auto &allocator{mapping->bigPage ? *vm.bigPageAllocator : *vm.smallPageAllocator};
u32 pageSizeBits{mapping->bigPage ? vm.bigPageSizeBits : VM::PageSizeBits};
allocator.Free(static_cast<u32>(mapping->offset >> pageSizeBits), static_cast<u32>(mapping->size >> pageSizeBits));
}
// Sparse mappings shouldn't be fully unmapped, just returned to their sparse state
// Only FreeSpace can unmap them fully
if (mapping->sparseAlloc)
asCtx->gmmu.Map(offset, GMMU::SparsePlaceholderAddress(), mapping->size, {true});
else
asCtx->gmmu.Unmap(offset, mapping->size);
mappingMap.erase(offset);
} catch (const std::out_of_range &e) { } catch (const std::out_of_range &e) {
Logger::Warn("Couldn't find region to unmap at 0x{:X}", offset); Logger::Warn("Couldn't find region to unmap at 0x{:X}", offset);
} }