Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1787 from bunnei/fix-gpu-mm

Browse source 
memory_manager: Do not allow 0 to be a valid GPUVAddr.
This commit is contained in:
bunnei 2018-11-24 23:45:00 -05:00 committed by GitHub
commit 7d544c1b9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/video_core/memory_manager.cpp
View file

@ -9,6 +9,13 @@
namespace Tegra { namespace Tegra {
MemoryManager::MemoryManager() {
// Mark the first page as reserved, so that 0 is not a valid GPUVAddr. Otherwise, games might
// try to use 0 as a valid address, which is also used to mean nullptr. This fixes a bug with
// Undertale using 0 for a render target.
PageSlot(0) = static_cast<u64>(PageStatus::Reserved);
}
GPUVAddr MemoryManager::AllocateSpace(u64 size, u64 align) { GPUVAddr MemoryManager::AllocateSpace(u64 size, u64 align) {
const std::optional<GPUVAddr> gpu_addr{FindFreeBlock(0, size, align, PageStatus::Unmapped)}; const std::optional<GPUVAddr> gpu_addr{FindFreeBlock(0, size, align, PageStatus::Unmapped)};

3
src/video_core/memory_manager.h
View file

@ -18,7 +18,7 @@ using GPUVAddr = u64;
class MemoryManager final { class MemoryManager final {
public: public:
MemoryManager() = default; MemoryManager();
GPUVAddr AllocateSpace(u64 size, u64 align); GPUVAddr AllocateSpace(u64 size, u64 align);
GPUVAddr AllocateSpace(GPUVAddr gpu_addr, u64 size, u64 align); GPUVAddr AllocateSpace(GPUVAddr gpu_addr, u64 size, u64 align);
@ -37,6 +37,7 @@ private:
enum class PageStatus : u64 { enum class PageStatus : u64 {
Unmapped = 0xFFFFFFFFFFFFFFFFULL, Unmapped = 0xFFFFFFFFFFFFFFFFULL,
Allocated = 0xFFFFFFFFFFFFFFFEULL, Allocated = 0xFFFFFFFFFFFFFFFEULL,
Reserved = 0xFFFFFFFFFFFFFFFDULL,
}; };
std::optional<GPUVAddr> FindFreeBlock(GPUVAddr region_start, u64 size, u64 align, std::optional<GPUVAddr> FindFreeBlock(GPUVAddr region_start, u64 size, u64 align,