aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel
diff options
context:
space:
mode:
authorAc_K <Acoustik666@gmail.com>2019-09-19 02:45:11 +0200
committerjduncanator <1518948+jduncanator@users.noreply.github.com>2019-09-19 10:45:11 +1000
commita0720b5681852f3d786d77bd3793b0359dea321c (patch)
tree9d8f61e540d1d1d827999902dad95e5c0c1e076e /Ryujinx.HLE/HOS/Services/Nv/NvHostChannel
parent4af3101b22e6957d6aa48a2768566d658699f4ed (diff)
Refactoring HOS folder structure (#771)
* Refactoring HOS folder structure Refactoring HOS folder structure: - Added some subfolders when needed (Following structure decided in private). - Added some `Types` folders when needed. - Little cleanup here and there. - Add services placeholders for every HOS services (close #766 and #753). * Remove Types namespaces
Diffstat (limited to 'Ryujinx.HLE/HOS/Services/Nv/NvHostChannel')
-rw-r--r--Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvChannel.cs9
-rw-r--r--Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvChannelPriority.cs9
-rw-r--r--Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelCmdBuf.cs12
-rw-r--r--Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelGetParamArg.cs11
-rw-r--r--Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelIoctl.cs371
-rw-r--r--Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelMapBuffer.cs12
-rw-r--r--Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelSubmit.cs13
-rw-r--r--Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelSubmitGpfifo.cs11
8 files changed, 0 insertions, 448 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvChannel.cs b/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvChannel.cs
deleted file mode 100644
index 74d27a75..00000000
--- a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvChannel.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Ryujinx.HLE.HOS.Services.Nv.NvHostChannel
-{
- class NvChannel
- {
- public int Timeout;
- public int SubmitTimeout;
- public int Timeslice;
- }
-} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvChannelPriority.cs b/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvChannelPriority.cs
deleted file mode 100644
index d41e7609..00000000
--- a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvChannelPriority.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Ryujinx.HLE.HOS.Services.Nv.NvHostChannel
-{
- enum NvChannelPriority
- {
- Low = 50,
- Medium = 100,
- High = 150
- }
-} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelCmdBuf.cs b/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelCmdBuf.cs
deleted file mode 100644
index 44949597..00000000
--- a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelCmdBuf.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.HLE.HOS.Services.Nv.NvHostChannel
-{
- [StructLayout(LayoutKind.Sequential, Size = 8, Pack = 4)]
- struct NvHostChannelCmdBuf
- {
- public int MemoryId;
- public int Offset;
- public int WordsCount;
- }
-} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelGetParamArg.cs b/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelGetParamArg.cs
deleted file mode 100644
index 5c04e5d4..00000000
--- a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelGetParamArg.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.HLE.HOS.Services.Nv.NvHostChannel
-{
- [StructLayout(LayoutKind.Sequential, Size = 8, Pack = 4)]
- struct NvHostChannelGetParamArg
- {
- public int Param;
- public int Value;
- }
-} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelIoctl.cs b/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelIoctl.cs
deleted file mode 100644
index fdfb3fa5..00000000
--- a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelIoctl.cs
+++ /dev/null
@@ -1,371 +0,0 @@
-using ARMeilleure.Memory;
-using Ryujinx.Common.Logging;
-using Ryujinx.Graphics.Memory;
-using Ryujinx.HLE.HOS.Kernel.Process;
-using Ryujinx.HLE.HOS.Services.Nv.NvGpuAS;
-using Ryujinx.HLE.HOS.Services.Nv.NvMap;
-using System;
-using System.Collections.Concurrent;
-
-namespace Ryujinx.HLE.HOS.Services.Nv.NvHostChannel
-{
- class NvHostChannelIoctl
- {
- private static ConcurrentDictionary<KProcess, NvChannel> _channels;
-
- static NvHostChannelIoctl()
- {
- _channels = new ConcurrentDictionary<KProcess, NvChannel>();
- }
-
- public static int ProcessIoctl(ServiceCtx context, int cmd)
- {
- switch (cmd & 0xffff)
- {
- case 0x0001: return Submit (context);
- case 0x0002: return GetSyncpoint (context);
- case 0x0003: return GetWaitBase (context);
- case 0x0007: return SetSubmitTimeout (context);
- case 0x0009: return MapBuffer (context);
- case 0x000a: return UnmapBuffer (context);
- case 0x4714: return SetUserData (context);
- case 0x4801: return SetNvMap (context);
- case 0x4803: return SetTimeout (context);
- case 0x4808: return SubmitGpfifo (context);
- case 0x4809: return AllocObjCtx (context);
- case 0x480b: return ZcullBind (context);
- case 0x480c: return SetErrorNotifier (context);
- case 0x480d: return SetPriority (context);
- case 0x481a: return AllocGpfifoEx2 (context);
- case 0x481b: return KickoffPbWithAttr(context);
- case 0x481d: return SetTimeslice (context);
- }
-
- throw new NotImplementedException(cmd.ToString("x8"));
- }
-
- private static int Submit(ServiceCtx context)
- {
- long inputPosition = context.Request.GetBufferType0x21().Position;
- long outputPosition = context.Request.GetBufferType0x22().Position;
-
- NvHostChannelSubmit args = MemoryHelper.Read<NvHostChannelSubmit>(context.Memory, inputPosition);
-
- NvGpuVmm vmm = NvGpuASIoctl.GetASCtx(context).Vmm;
-
- for (int index = 0; index < args.CmdBufsCount; index++)
- {
- long cmdBufOffset = inputPosition + 0x10 + index * 0xc;
-
- NvHostChannelCmdBuf cmdBuf = MemoryHelper.Read<NvHostChannelCmdBuf>(context.Memory, cmdBufOffset);
-
- NvMapHandle map = NvMapIoctl.GetNvMap(context, cmdBuf.MemoryId);
-
- int[] cmdBufData = new int[cmdBuf.WordsCount];
-
- for (int offset = 0; offset < cmdBufData.Length; offset++)
- {
- cmdBufData[offset] = context.Memory.ReadInt32(map.Address + cmdBuf.Offset + offset * 4);
- }
-
- context.Device.Gpu.PushCommandBuffer(vmm, cmdBufData);
- }
-
- // TODO: Relocation, waitchecks, etc.
-
- return NvResult.Success;
- }
-
- private static int GetSyncpoint(ServiceCtx context)
- {
- // TODO
- long inputPosition = context.Request.GetBufferType0x21().Position;
- long outputPosition = context.Request.GetBufferType0x22().Position;
-
- NvHostChannelGetParamArg args = MemoryHelper.Read<NvHostChannelGetParamArg>(context.Memory, inputPosition);
-
- args.Value = 0;
-
- MemoryHelper.Write(context.Memory, outputPosition, args);
-
- return NvResult.Success;
- }
-
- private static int GetWaitBase(ServiceCtx context)
- {
- long inputPosition = context.Request.GetBufferType0x21().Position;
- long outputPosition = context.Request.GetBufferType0x22().Position;
-
- NvHostChannelGetParamArg args = MemoryHelper.Read<NvHostChannelGetParamArg>(context.Memory, inputPosition);
-
- args.Value = 0;
-
- MemoryHelper.Write(context.Memory, outputPosition, args);
-
- return NvResult.Success;
- }
-
- private static int SetSubmitTimeout(ServiceCtx context)
- {
- long inputPosition = context.Request.GetBufferType0x21().Position;
-
- GetChannel(context).SubmitTimeout = context.Memory.ReadInt32(inputPosition);
-
- // TODO: Handle the timeout in the submit method.
-
- Logger.PrintStub(LogClass.ServiceNv);
-
- return NvResult.Success;
- }
-
- private static int MapBuffer(ServiceCtx context)
- {
- long inputPosition = context.Request.GetBufferType0x21().Position;
- long outputPosition = context.Request.GetBufferType0x22().Position;
-
- NvHostChannelMapBuffer args = MemoryHelper.Read<NvHostChannelMapBuffer>(context.Memory, inputPosition);
-
- NvGpuVmm vmm = NvGpuASIoctl.GetASCtx(context).Vmm;
-
- for (int index = 0; index < args.NumEntries; index++)
- {
- int handle = context.Memory.ReadInt32(inputPosition + 0xc + index * 8);
-
- NvMapHandle map = NvMapIoctl.GetNvMap(context, handle);
-
- if (map == null)
- {
- Logger.PrintWarning(LogClass.ServiceNv, $"Invalid handle 0x{handle:x8}!");
-
- return NvResult.InvalidInput;
- }
-
- lock (map)
- {
- if (map.DmaMapAddress == 0)
- {
- map.DmaMapAddress = vmm.MapLow(map.Address, map.Size);
- }
-
- context.Memory.WriteInt32(outputPosition + 0xc + 4 + index * 8, (int)map.DmaMapAddress);
- }
- }
-
- return NvResult.Success;
- }
-
- private static int UnmapBuffer(ServiceCtx context)
- {
- long inputPosition = context.Request.GetBufferType0x21().Position;
-
- NvHostChannelMapBuffer args = MemoryHelper.Read<NvHostChannelMapBuffer>(context.Memory, inputPosition);
-
- NvGpuVmm vmm = NvGpuASIoctl.GetASCtx(context).Vmm;
-
- for (int index = 0; index < args.NumEntries; index++)
- {
- int handle = context.Memory.ReadInt32(inputPosition + 0xc + index * 8);
-
- NvMapHandle map = NvMapIoctl.GetNvMap(context, handle);
-
- if (map == null)
- {
- Logger.PrintWarning(LogClass.ServiceNv, $"Invalid handle 0x{handle:x8}!");
-
- return NvResult.InvalidInput;
- }
-
- lock (map)
- {
- if (map.DmaMapAddress != 0)
- {
- vmm.Free(map.DmaMapAddress, map.Size);
-
- map.DmaMapAddress = 0;
- }
- }
- }
-
- return NvResult.Success;
- }
-
- private static int SetUserData(ServiceCtx context)
- {
- long inputPosition = context.Request.GetBufferType0x21().Position;
- long outputPosition = context.Request.GetBufferType0x22().Position;
-
- Logger.PrintStub(LogClass.ServiceNv);
-
- return NvResult.Success;
- }
-
- private static int SetNvMap(ServiceCtx context)
- {
- long inputPosition = context.Request.GetBufferType0x21().Position;
- long outputPosition = context.Request.GetBufferType0x22().Position;
-
- Logger.PrintStub(LogClass.ServiceNv);
-
- return NvResult.Success;
- }
-
- private static int SetTimeout(ServiceCtx context)
- {
- long inputPosition = context.Request.GetBufferType0x21().Position;
-
- GetChannel(context).Timeout = context.Memory.ReadInt32(inputPosition);
-
- Logger.PrintStub(LogClass.ServiceNv);
-
- return NvResult.Success;
- }
-
- private static int SubmitGpfifo(ServiceCtx context)
- {
- long inputPosition = context.Request.GetBufferType0x21().Position;
- long outputPosition = context.Request.GetBufferType0x22().Position;
-
- NvHostChannelSubmitGpfifo args = MemoryHelper.Read<NvHostChannelSubmitGpfifo>(context.Memory, inputPosition);
-
- NvGpuVmm vmm = NvGpuASIoctl.GetASCtx(context).Vmm;
-
- for (int index = 0; index < args.NumEntries; index++)
- {
- long gpfifo = context.Memory.ReadInt64(inputPosition + 0x18 + index * 8);
-
- PushGpfifo(context, vmm, gpfifo);
- }
-
- args.SyncptId = 0;
- args.SyncptValue = 0;
-
- MemoryHelper.Write(context.Memory, outputPosition, args);
-
- return NvResult.Success;
- }
-
- private static int AllocObjCtx(ServiceCtx context)
- {
- long inputPosition = context.Request.GetBufferType0x21().Position;
- long outputPosition = context.Request.GetBufferType0x22().Position;
-
- Logger.PrintStub(LogClass.ServiceNv);
-
- return NvResult.Success;
- }
-
- private static int ZcullBind(ServiceCtx context)
- {
- long inputPosition = context.Request.GetBufferType0x21().Position;
- long outputPosition = context.Request.GetBufferType0x22().Position;
-
- Logger.PrintStub(LogClass.ServiceNv);
-
- return NvResult.Success;
- }
-
- private static int SetErrorNotifier(ServiceCtx context)
- {
- long inputPosition = context.Request.GetBufferType0x21().Position;
- long outputPosition = context.Request.GetBufferType0x22().Position;
-
- Logger.PrintStub(LogClass.ServiceNv);
-
- return NvResult.Success;
- }
-
- private static int SetPriority(ServiceCtx context)
- {
- long inputPosition = context.Request.GetBufferType0x21().Position;
-
- switch ((NvChannelPriority)context.Memory.ReadInt32(inputPosition))
- {
- case NvChannelPriority.Low:
- GetChannel(context).Timeslice = 1300; // Timeslice low priority in micro-seconds
- break;
- case NvChannelPriority.Medium:
- GetChannel(context).Timeslice = 2600; // Timeslice medium priority in micro-seconds
- break;
- case NvChannelPriority.High:
- GetChannel(context).Timeslice = 5200; // Timeslice high priority in micro-seconds
- break;
- default:
- return NvResult.InvalidInput;
- }
-
- Logger.PrintStub(LogClass.ServiceNv);
-
- // TODO: disable and preempt channel when GPU scheduler will be implemented.
-
- return NvResult.Success;
- }
-
- private static int AllocGpfifoEx2(ServiceCtx context)
- {
- long inputPosition = context.Request.GetBufferType0x21().Position;
- long outputPosition = context.Request.GetBufferType0x22().Position;
-
- Logger.PrintStub(LogClass.ServiceNv);
-
- return NvResult.Success;
- }
-
- private static int KickoffPbWithAttr(ServiceCtx context)
- {
- long inputPosition = context.Request.GetBufferType0x21().Position;
- long outputPosition = context.Request.GetBufferType0x22().Position;
-
- NvHostChannelSubmitGpfifo args = MemoryHelper.Read<NvHostChannelSubmitGpfifo>(context.Memory, inputPosition);
-
- NvGpuVmm vmm = NvGpuASIoctl.GetASCtx(context).Vmm;
-
- for (int index = 0; index < args.NumEntries; index++)
- {
- long gpfifo = context.Memory.ReadInt64(args.Address + index * 8);
-
- PushGpfifo(context, vmm, gpfifo);
- }
-
- args.SyncptId = 0;
- args.SyncptValue = 0;
-
- MemoryHelper.Write(context.Memory, outputPosition, args);
-
- return NvResult.Success;
- }
-
- private static int SetTimeslice(ServiceCtx context)
- {
- long inputPosition = context.Request.GetBufferType0x21().Position;
- int timeslice = context.Memory.ReadInt32(inputPosition);
-
- if (timeslice < 1000 || timeslice > 50000)
- {
- return NvResult.InvalidInput;
- }
-
- GetChannel(context).Timeslice = timeslice; // in micro-seconds
-
- Logger.PrintStub(LogClass.ServiceNv);
-
- // TODO: disable and preempt channel when GPU scheduler will be implemented.
-
- return NvResult.Success;
- }
-
- private static void PushGpfifo(ServiceCtx context, NvGpuVmm vmm, long gpfifo)
- {
- context.Device.Gpu.Pusher.Push(vmm, gpfifo);
- }
-
- public static NvChannel GetChannel(ServiceCtx context)
- {
- return _channels.GetOrAdd(context.Process, (key) => new NvChannel());
- }
-
- public static void UnloadProcess(KProcess process)
- {
- _channels.TryRemove(process, out _);
- }
- }
-} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelMapBuffer.cs b/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelMapBuffer.cs
deleted file mode 100644
index 1dfedf2d..00000000
--- a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelMapBuffer.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.HLE.HOS.Services.Nv.NvHostChannel
-{
- [StructLayout(LayoutKind.Sequential, Size = 0xc, Pack = 4)]
- struct NvHostChannelMapBuffer
- {
- public int NumEntries;
- public int DataAddress; //Ignored by the driver.
- public bool AttachHostChDas;
- }
-} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelSubmit.cs b/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelSubmit.cs
deleted file mode 100644
index f776ad87..00000000
--- a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelSubmit.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.HLE.HOS.Services.Nv.NvHostChannel
-{
- [StructLayout(LayoutKind.Sequential, Size = 8, Pack = 4)]
- struct NvHostChannelSubmit
- {
- public int CmdBufsCount;
- public int RelocsCount;
- public int SyncptIncrsCount;
- public int WaitchecksCount;
- }
-} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelSubmitGpfifo.cs b/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelSubmitGpfifo.cs
deleted file mode 100644
index edebcfeb..00000000
--- a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelSubmitGpfifo.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Ryujinx.HLE.HOS.Services.Nv.NvHostChannel
-{
- struct NvHostChannelSubmitGpfifo
- {
- public long Address;
- public int NumEntries;
- public int Flags;
- public int SyncptId;
- public int SyncptValue;
- }
-} \ No newline at end of file