RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-03-06 13:33:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

enforce gnm driver loading, fix syncing flexible memory with gpu

Browse source
This commit is contained in:
DH 2025-12-05 20:44:56 +03:00
parent 0ce879d966
commit 5b3bc0e97a
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
kernel/orbis/src/vmem.cpp
View file

@ -261,8 +261,10 @@ static void release(orbis::Process *process, decltype(g_vmInstance)::type *vmem,
auto blockRange = range.intersection(it.range()); auto blockRange = range.intersection(it.range());
auto gpuProt = orbis::vmem::toGpuProtection(it->prot);
if (it->flags & orbis::vmem::BlockFlags::FlexibleMemory) { if (it->flags & orbis::vmem::BlockFlags::FlexibleMemory) {
if (it->device == nullptr) { if (it->device == nullptr && gpuProt) {
amdgpu::unmapMemory(process->pid, blockRange);
orbis::fmem::deallocate(blockRange); orbis::fmem::deallocate(blockRange);
} }
budget->release(orbis::BudgetResource::Fmem, blockRange.size()); budget->release(orbis::BudgetResource::Fmem, blockRange.size());
@ -281,9 +283,8 @@ static void release(orbis::Process *process, decltype(g_vmInstance)::type *vmem,
} }
} }
if (orbis::vmem::toGpuProtection(it->prot) && if (gpuProt && (it->flags & orbis::vmem::BlockFlags::DirectMemory |
(it->flags & orbis::vmem::BlockFlags::DirectMemory | orbis::vmem::BlockFlags::PooledMemory)) {
orbis::vmem::BlockFlags::PooledMemory)) {
amdgpu::unmapMemory(process->pid, blockRange); amdgpu::unmapMemory(process->pid, blockRange);
} }
} }
@ -566,7 +567,8 @@ std::pair<rx::AddressRange, orbis::ErrorCode> orbis::vmem::mapFile(
blockpool::releaseControlBlock(); blockpool::releaseControlBlock();
} }
rx::println(stderr, "map: device allocation failure, blockFlags {}", blockFlags); rx::println(stderr, "map: device allocation failure, blockFlags {}",
blockFlags);
return {{}, error}; return {{}, error};
} }
@ -823,7 +825,13 @@ std::pair<rx::AddressRange, orbis::ErrorCode> orbis::vmem::mapFlex(
AllocationFlags::Fixed | (allocFlags & AllocationFlags::NoMerge), AllocationFlags::Fixed | (allocFlags & AllocationFlags::NoMerge),
alignment); alignment);
// vmemDump(process, rx::format("mapFlex {:x}-{:x}", vmemRange.beginAddress(), if (prot) {
amdgpu::mapMemory(process->pid, vmemRange, MemoryType::WbOnion, prot,
allocationInfo.deviceOffset);
}
// vmemDump(process, rx::format("mapFlex {:x}-{:x}",
// vmemRange.beginAddress(),
// vmemRange.endAddress())); // vmemRange.endAddress()));
fmemResource.commit(); fmemResource.commit();
return {vmemRange, {}}; return {vmemRange, {}};
@ -1139,6 +1147,9 @@ orbis::ErrorCode orbis::vmem::protect(Process *process, rx::AddressRange range,
toCpuProtection(blockProt)); toCpuProtection(blockProt));
rx::dieIf(errc != ErrorCode{}, "failed to map flexible memory"); rx::dieIf(errc != ErrorCode{}, "failed to map flexible memory");
amdgpu::mapMemory(process->pid, range, MemoryType::WbOnion,
prot, pmemRange.beginAddress());
} else if (!blockProt && alloc.prot) { } else if (!blockProt && alloc.prot) {
auto errc = fmem::deallocate(rx::AddressRange::fromBeginSize( auto errc = fmem::deallocate(rx::AddressRange::fromBeginSize(
alloc.deviceOffset, range.size())); alloc.deviceOffset, range.size()));

2
rpcsx/ops.cpp
View file

@ -357,7 +357,7 @@ orbis::SysResult dynlib_load_prx(orbis::Thread *thread,
} }
if (it->second == resultModule) { if (it->second == resultModule) {
wasNeeded = true; // wasNeeded = true;
} }
continue; continue;
} }