diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2019-12-24 22:54:26 -0300 |
|---|---|---|
| committer | Ac_K <Acoustik666@gmail.com> | 2019-12-25 02:54:26 +0100 |
| commit | 87bfe681ef65ed692aa1e46e3f5f8229013cf46a (patch) | |
| tree | 9e68d8eeeb7dee1fe31fc7fa4924972ed7753ba5 | |
| parent | 17b2be7174b857a48c24592e2e6c067324821ade (diff) | |
Fix remap ioctl map offset (#852)
* Fix remap ioctl map offset
* Correct offset type
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/NvHostAsGpuDeviceFile.cs | 8 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/Types/RemapArguments.cs | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/NvHostAsGpuDeviceFile.cs b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/NvHostAsGpuDeviceFile.cs index 70783b43..b48377a4 100644 --- a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/NvHostAsGpuDeviceFile.cs +++ b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/NvHostAsGpuDeviceFile.cs @@ -293,13 +293,15 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostAsGpu return NvInternalResult.InvalidInput; } - long result = vmm.Map(map.Address, (long)arguments[index].Offset << 16, - (long)arguments[index].Pages << 16); + long result = vmm.Map( + ((long)arguments[index].MapOffset << 16) + map.Address, + (long)arguments[index].GpuOffset << 16, + (long)arguments[index].Pages << 16); if (result < 0) { Logger.PrintWarning(LogClass.ServiceNv, - $"Page 0x{arguments[index].Offset:x16} size 0x{arguments[index].Pages:x16} not allocated!"); + $"Page 0x{arguments[index].GpuOffset:x16} size 0x{arguments[index].Pages:x16} not allocated!"); return NvInternalResult.InvalidInput; } diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/Types/RemapArguments.cs b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/Types/RemapArguments.cs index 0cf324b4..bc149d42 100644 --- a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/Types/RemapArguments.cs +++ b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/Types/RemapArguments.cs @@ -8,8 +8,8 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostAsGpu.Types public ushort Flags; public ushort Kind; public int NvMapHandle; - public int Padding; - public uint Offset; + public uint MapOffset; + public uint GpuOffset; public uint Pages; } } |