aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Graphics.Gpu/Memory/MemoryManager.cs
diff options
context:
space:
mode:
Diffstat (limited to 'Ryujinx.Graphics.Gpu/Memory/MemoryManager.cs')
-rw-r--r--Ryujinx.Graphics.Gpu/Memory/MemoryManager.cs191
1 files changed, 2 insertions, 189 deletions
diff --git a/Ryujinx.Graphics.Gpu/Memory/MemoryManager.cs b/Ryujinx.Graphics.Gpu/Memory/MemoryManager.cs
index 91575e20..2990fb52 100644
--- a/Ryujinx.Graphics.Gpu/Memory/MemoryManager.cs
+++ b/Ryujinx.Graphics.Gpu/Memory/MemoryManager.cs
@@ -10,10 +10,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
/// </summary>
public class MemoryManager
{
- private const ulong AddressSpaceSize = 1UL << 40;
-
- public const ulong BadAddress = ulong.MaxValue;
-
private const int PtLvl0Bits = 14;
private const int PtLvl1Bits = 14;
public const int PtPageBits = 12;
@@ -29,8 +25,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
private const int PtLvl0Bit = PtPageBits + PtLvl1Bits;
private const int PtLvl1Bit = PtPageBits;
- private const ulong PteUnmapped = 0xffffffff_ffffffff;
- private const ulong PteReserved = 0xffffffff_fffffffe;
+ public const ulong PteUnmapped = 0xffffffff_ffffffff;
private readonly ulong[][] _pageTable;
@@ -137,116 +132,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
}
/// <summary>
- /// Maps a given range of pages to an allocated GPU virtual address.
- /// The memory is automatically allocated by the memory manager.
- /// </summary>
- /// <param name="pa">CPU virtual address to map into</param>
- /// <param name="size">Size in bytes of the mapping</param>
- /// <param name="alignment">Required alignment of the GPU virtual address in bytes</param>
- /// <returns>GPU virtual address where the range was mapped, or an all ones mask in case of failure</returns>
- public ulong MapAllocate(ulong pa, ulong size, ulong alignment)
- {
- lock (_pageTable)
- {
- ulong va = GetFreePosition(size, alignment);
-
- if (va != PteUnmapped)
- {
- for (ulong offset = 0; offset < size; offset += PageSize)
- {
- SetPte(va + offset, pa + offset);
- }
- }
-
- return va;
- }
- }
-
- /// <summary>
- /// Maps a given range of pages to an allocated GPU virtual address.
- /// The memory is automatically allocated by the memory manager.
- /// This also ensures that the mapping is always done in the first 4GB of GPU address space.
- /// </summary>
- /// <param name="pa">CPU virtual address to map into</param>
- /// <param name="size">Size in bytes of the mapping</param>
- /// <returns>GPU virtual address where the range was mapped, or an all ones mask in case of failure</returns>
- public ulong MapLow(ulong pa, ulong size)
- {
- lock (_pageTable)
- {
- ulong va = GetFreePosition(size, 1, PageSize);
-
- if (va != PteUnmapped && va <= uint.MaxValue && (va + size) <= uint.MaxValue)
- {
- for (ulong offset = 0; offset < size; offset += PageSize)
- {
- SetPte(va + offset, pa + offset);
- }
- }
- else
- {
- va = PteUnmapped;
- }
-
- return va;
- }
- }
-
- /// <summary>
- /// Reserves memory at a fixed GPU memory location.
- /// This prevents the reserved region from being used for memory allocation for map.
- /// </summary>
- /// <param name="va">GPU virtual address to reserve</param>
- /// <param name="size">Size in bytes of the reservation</param>
- /// <returns>GPU virtual address of the reservation, or an all ones mask in case of failure</returns>
- public ulong ReserveFixed(ulong va, ulong size)
- {
- lock (_pageTable)
- {
- MemoryUnmapped?.Invoke(this, new UnmapEventArgs(va, size));
-
- for (ulong offset = 0; offset < size; offset += PageSize)
- {
- if (IsPageInUse(va + offset))
- {
- return PteUnmapped;
- }
- }
-
- for (ulong offset = 0; offset < size; offset += PageSize)
- {
- SetPte(va + offset, PteReserved);
- }
- }
-
- return va;
- }
-
- /// <summary>
- /// Reserves memory at any GPU memory location.
- /// </summary>
- /// <param name="size">Size in bytes of the reservation</param>
- /// <param name="alignment">Reservation address alignment in bytes</param>
- /// <returns>GPU virtual address of the reservation, or an all ones mask in case of failure</returns>
- public ulong Reserve(ulong size, ulong alignment)
- {
- lock (_pageTable)
- {
- ulong address = GetFreePosition(size, alignment);
-
- if (address != PteUnmapped)
- {
- for (ulong offset = 0; offset < size; offset += PageSize)
- {
- SetPte(address + offset, PteReserved);
- }
- }
-
- return address;
- }
- }
-
- /// <summary>
/// Frees memory that was previously allocated by a map or reserved.
/// </summary>
/// <param name="va">GPU virtual address to free</param>
@@ -266,55 +151,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
}
/// <summary>
- /// Gets the address of an unused (free) region of the specified size.
- /// </summary>
- /// <param name="size">Size of the region in bytes</param>
- /// <param name="alignment">Required alignment of the region address in bytes</param>
- /// <param name="start">Start address of the search on the address space</param>
- /// <returns>GPU virtual address of the allocation, or an all ones mask in case of failure</returns>
- private ulong GetFreePosition(ulong size, ulong alignment = 1, ulong start = 1UL << 32)
- {
- // Note: Address 0 is not considered valid by the driver,
- // when 0 is returned it's considered a mapping error.
- ulong address = start;
- ulong freeSize = 0;
-
- if (alignment == 0)
- {
- alignment = 1;
- }
-
- alignment = (alignment + PageMask) & ~PageMask;
-
- while (address + freeSize < AddressSpaceSize)
- {
- if (!IsPageInUse(address + freeSize))
- {
- freeSize += PageSize;
-
- if (freeSize >= size)
- {
- return address;
- }
- }
- else
- {
- address += freeSize + PageSize;
- freeSize = 0;
-
- ulong remainder = address % alignment;
-
- if (remainder != 0)
- {
- address = (address - remainder) + alignment;
- }
- }
- }
-
- return PteUnmapped;
- }
-
- /// <summary>
/// Checks if a given page is mapped.
/// </summary>
/// <param name="gpuVa">GPU virtual address of the page to check</param>
@@ -333,7 +169,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
{
ulong baseAddress = GetPte(gpuVa);
- if (baseAddress == PteUnmapped || baseAddress == PteReserved)
+ if (baseAddress == PteUnmapped)
{
return PteUnmapped;
}
@@ -342,29 +178,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
}
/// <summary>
- /// Checks if a given memory page is mapped or reserved.
- /// </summary>
- /// <param name="gpuVa">GPU virtual address of the page</param>
- /// <returns>True if the page is mapped or reserved, false otherwise</returns>
- private bool IsPageInUse(ulong gpuVa)
- {
- if (gpuVa >> PtLvl0Bits + PtLvl1Bits + PtPageBits != 0)
- {
- return false;
- }
-
- ulong l0 = (gpuVa >> PtLvl0Bit) & PtLvl0Mask;
- ulong l1 = (gpuVa >> PtLvl1Bit) & PtLvl1Mask;
-
- if (_pageTable[l0] == null)
- {
- return false;
- }
-
- return _pageTable[l0][l1] != PteUnmapped;
- }
-
- /// <summary>
/// Gets the Page Table entry for a given GPU virtual address.
/// </summary>
/// <param name="gpuVa">GPU virtual address</param>