diff options
| author | 2018-02-07 21:54:35 -0500 | |
|---|---|---|
| committer | 2018-02-07 23:31:26 -0500 | |
| commit | c711253798b32c4ef73cf38749ea5cf17a352daa (patch) | |
| tree | 9569ccc93878656bf90c1697b2a2a27efe80867c /src | |
| parent | nvmap: Refactor to expose nvmap objects. (diff) | |
| download | yuzu-c711253798b32c4ef73cf38749ea5cf17a352daa.tar.gz yuzu-c711253798b32c4ef73cf38749ea5cf17a352daa.tar.xz yuzu-c711253798b32c4ef73cf38749ea5cf17a352daa.zip | |
nvdrv: Add MemoryManager class to track GPU memory.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/core/hle/service/nvdrv/memory_manager.cpp | 112 | ||||
| -rw-r--r-- | src/core/hle/service/nvdrv/memory_manager.h | 48 |
3 files changed, 162 insertions, 0 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 02c178441..eab08207d 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt | |||
| @@ -137,6 +137,8 @@ add_library(core STATIC | |||
| 137 | hle/service/nvdrv/devices/nvmap.h | 137 | hle/service/nvdrv/devices/nvmap.h |
| 138 | hle/service/nvdrv/interface.cpp | 138 | hle/service/nvdrv/interface.cpp |
| 139 | hle/service/nvdrv/interface.h | 139 | hle/service/nvdrv/interface.h |
| 140 | hle/service/nvdrv/memory_manager.cpp | ||
| 141 | hle/service/nvdrv/memory_manager.h | ||
| 140 | hle/service/nvdrv/nvdrv.cpp | 142 | hle/service/nvdrv/nvdrv.cpp |
| 141 | hle/service/nvdrv/nvdrv.h | 143 | hle/service/nvdrv/nvdrv.h |
| 142 | hle/service/nvdrv/nvmemp.cpp | 144 | hle/service/nvdrv/nvmemp.cpp |
diff --git a/src/core/hle/service/nvdrv/memory_manager.cpp b/src/core/hle/service/nvdrv/memory_manager.cpp new file mode 100644 index 000000000..55a8675d5 --- /dev/null +++ b/src/core/hle/service/nvdrv/memory_manager.cpp | |||
| @@ -0,0 +1,112 @@ | |||
| 1 | // Copyright 2018 yuzu emulator team | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #include "common/assert.h" | ||
| 6 | #include "core/hle/service/nvdrv/memory_manager.h" | ||
| 7 | |||
| 8 | namespace Service { | ||
| 9 | namespace Nvidia { | ||
| 10 | |||
| 11 | PAddr MemoryManager::AllocateSpace(u64 size, u64 align) { | ||
| 12 | boost::optional<PAddr> paddr = FindFreeBlock(size, align); | ||
| 13 | ASSERT(paddr); | ||
| 14 | |||
| 15 | for (u64 offset = 0; offset < size; offset += Memory::PAGE_SIZE) { | ||
| 16 | PageSlot(*paddr + offset) = static_cast<u64>(PageStatus::Allocated); | ||
| 17 | } | ||
| 18 | |||
| 19 | return *paddr; | ||
| 20 | } | ||
| 21 | |||
| 22 | PAddr MemoryManager::AllocateSpace(PAddr paddr, u64 size, u64 align) { | ||
| 23 | for (u64 offset = 0; offset < size; offset += Memory::PAGE_SIZE) { | ||
| 24 | if (IsPageMapped(paddr + offset)) { | ||
| 25 | return AllocateSpace(size, align); | ||
| 26 | } | ||
| 27 | } | ||
| 28 | |||
| 29 | for (u64 offset = 0; offset < size; offset += Memory::PAGE_SIZE) { | ||
| 30 | PageSlot(paddr + offset) = static_cast<u64>(PageStatus::Allocated); | ||
| 31 | } | ||
| 32 | |||
| 33 | return paddr; | ||
| 34 | } | ||
| 35 | |||
| 36 | PAddr MemoryManager::MapBufferEx(VAddr vaddr, u64 size) { | ||
| 37 | vaddr &= ~Memory::PAGE_MASK; | ||
| 38 | |||
| 39 | boost::optional<PAddr> paddr = FindFreeBlock(size); | ||
| 40 | ASSERT(paddr); | ||
| 41 | |||
| 42 | for (u64 offset = 0; offset < size; offset += Memory::PAGE_SIZE) { | ||
| 43 | PageSlot(*paddr + offset) = vaddr + offset; | ||
| 44 | } | ||
| 45 | |||
| 46 | return *paddr; | ||
| 47 | } | ||
| 48 | |||
| 49 | PAddr MemoryManager::MapBufferEx(VAddr vaddr, PAddr paddr, u64 size) { | ||
| 50 | vaddr &= ~Memory::PAGE_MASK; | ||
| 51 | paddr &= ~Memory::PAGE_MASK; | ||
| 52 | |||
| 53 | for (u64 offset = 0; offset < size; offset += Memory::PAGE_SIZE) { | ||
| 54 | if (PageSlot(paddr + offset) != static_cast<u64>(PageStatus::Allocated)) { | ||
| 55 | return MapBufferEx(vaddr, size); | ||
| 56 | } | ||
| 57 | } | ||
| 58 | |||
| 59 | for (u64 offset = 0; offset < size; offset += Memory::PAGE_SIZE) { | ||
| 60 | PageSlot(paddr + offset) = vaddr + offset; | ||
| 61 | } | ||
| 62 | |||
| 63 | return paddr; | ||
| 64 | } | ||
| 65 | |||
| 66 | boost::optional<PAddr> MemoryManager::FindFreeBlock(u64 size, u64 align) { | ||
| 67 | PAddr paddr{}; | ||
| 68 | u64 free_space{}; | ||
| 69 | align = (align + Memory::PAGE_MASK) & ~Memory::PAGE_MASK; | ||
| 70 | |||
| 71 | while (paddr + free_space < MAX_ADDRESS) { | ||
| 72 | if (!IsPageMapped(paddr + free_space)) { | ||
| 73 | free_space += Memory::PAGE_SIZE; | ||
| 74 | if (free_space >= size) { | ||
| 75 | return paddr; | ||
| 76 | } | ||
| 77 | } else { | ||
| 78 | paddr += free_space + Memory::PAGE_SIZE; | ||
| 79 | free_space = 0; | ||
| 80 | const u64 remainder{paddr % align}; | ||
| 81 | if (!remainder) { | ||
| 82 | paddr = (paddr - remainder) + align; | ||
| 83 | } | ||
| 84 | } | ||
| 85 | } | ||
| 86 | |||
| 87 | return {}; | ||
| 88 | } | ||
| 89 | |||
| 90 | VAddr MemoryManager::PhysicalToVirtualAddress(PAddr paddr) { | ||
| 91 | VAddr base_addr = PageSlot(paddr); | ||
| 92 | ASSERT(base_addr != static_cast<u64>(PageStatus::Unmapped)); | ||
| 93 | return base_addr + (paddr & Memory::PAGE_MASK); | ||
| 94 | } | ||
| 95 | |||
| 96 | bool MemoryManager::IsPageMapped(PAddr paddr) { | ||
| 97 | return PageSlot(paddr) != static_cast<u64>(PageStatus::Unmapped); | ||
| 98 | } | ||
| 99 | |||
| 100 | VAddr& MemoryManager::PageSlot(PAddr paddr) { | ||
| 101 | auto& block = page_table[(paddr >> (Memory::PAGE_BITS + PAGE_TABLE_BITS)) & PAGE_TABLE_MASK]; | ||
| 102 | if (!block) { | ||
| 103 | block = std::make_unique<PageBlock>(); | ||
| 104 | for (unsigned index = 0; index < PAGE_BLOCK_SIZE; index++) { | ||
| 105 | (*block)[index] = static_cast<u64>(PageStatus::Unmapped); | ||
| 106 | } | ||
| 107 | } | ||
| 108 | return (*block)[(paddr >> Memory::PAGE_BITS) & PAGE_BLOCK_MASK]; | ||
| 109 | } | ||
| 110 | |||
| 111 | } // namespace Nvidia | ||
| 112 | } // namespace Service | ||
diff --git a/src/core/hle/service/nvdrv/memory_manager.h b/src/core/hle/service/nvdrv/memory_manager.h new file mode 100644 index 000000000..4ba1a3952 --- /dev/null +++ b/src/core/hle/service/nvdrv/memory_manager.h | |||
| @@ -0,0 +1,48 @@ | |||
| 1 | // Copyright 2018 yuzu emulator team | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #pragma once | ||
| 6 | |||
| 7 | #include <array> | ||
| 8 | #include <memory> | ||
| 9 | #include "common/common_types.h" | ||
| 10 | #include "core/memory.h" | ||
| 11 | |||
| 12 | namespace Service { | ||
| 13 | namespace Nvidia { | ||
| 14 | |||
| 15 | class MemoryManager final { | ||
| 16 | public: | ||
| 17 | MemoryManager() = default; | ||
| 18 | |||
| 19 | PAddr AllocateSpace(u64 size, u64 align); | ||
| 20 | PAddr AllocateSpace(PAddr paddr, u64 size, u64 align); | ||
| 21 | PAddr MapBufferEx(VAddr vaddr, u64 size); | ||
| 22 | PAddr MapBufferEx(VAddr vaddr, PAddr paddr, u64 size); | ||
| 23 | VAddr PhysicalToVirtualAddress(PAddr paddr); | ||
| 24 | |||
| 25 | private: | ||
| 26 | boost::optional<PAddr> FindFreeBlock(u64 size, u64 align = 1); | ||
| 27 | bool IsPageMapped(PAddr paddr); | ||
| 28 | VAddr& PageSlot(PAddr paddr); | ||
| 29 | |||
| 30 | enum class PageStatus : u64 { | ||
| 31 | Unmapped = 0xFFFFFFFFFFFFFFFFULL, | ||
| 32 | Allocated = 0xFFFFFFFFFFFFFFFEULL, | ||
| 33 | }; | ||
| 34 | |||
| 35 | static constexpr u64 MAX_ADDRESS{0x10000000000ULL}; | ||
| 36 | static constexpr u64 PAGE_TABLE_BITS{14}; | ||
| 37 | static constexpr u64 PAGE_TABLE_SIZE{1 << PAGE_TABLE_BITS}; | ||
| 38 | static constexpr u64 PAGE_TABLE_MASK{PAGE_TABLE_SIZE - 1}; | ||
| 39 | static constexpr u64 PAGE_BLOCK_BITS{14}; | ||
| 40 | static constexpr u64 PAGE_BLOCK_SIZE{1 << PAGE_BLOCK_BITS}; | ||
| 41 | static constexpr u64 PAGE_BLOCK_MASK{PAGE_BLOCK_SIZE - 1}; | ||
| 42 | |||
| 43 | using PageBlock = std::array<VAddr, PAGE_BLOCK_SIZE>; | ||
| 44 | std::array<std::unique_ptr<PageBlock>, PAGE_TABLE_SIZE> page_table{}; | ||
| 45 | }; | ||
| 46 | |||
| 47 | } // namespace Nvidia | ||
| 48 | } // namespace Service | ||