emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

Add support for ioctl2, SetTimeout and KickoffPbWithAttr (#261)

Browse source 
* Add support for ioctl2, SetTimeout and KickoffPbWithAttr

* Call UnloadProcess on NvHostChannelIoctl aswell
This commit is contained in:
gdkchan 2018-07-15 00:04:46 -03:00 committed by GitHub
parent 98c6ceede5
commit 21e590c3ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 123 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Ryujinx.HLE/OsHle/Services/Nv/INvDrvServices.cs
View file

@ -23,11 +23,11 @@ namespace Ryujinx.HLE.OsHle.Services.Nv
private static Dictionary<string, IoctlProcessor> IoctlProcessors = private static Dictionary<string, IoctlProcessor> IoctlProcessors =
new Dictionary<string, IoctlProcessor>() new Dictionary<string, IoctlProcessor>()
{ {
{ "/dev/nvhost-as-gpu", ProcessIoctlNvGpuAS }, { "/dev/nvhost-as-gpu", ProcessIoctlNvGpuAS },
{ "/dev/nvhost-ctrl", ProcessIoctlNvHostCtrl }, { "/dev/nvhost-ctrl", ProcessIoctlNvHostCtrl },
{ "/dev/nvhost-ctrl-gpu", ProcessIoctlNvGpuGpu }, { "/dev/nvhost-ctrl-gpu", ProcessIoctlNvGpuGpu },
{ "/dev/nvhost-gpu", ProcessIoctlNvHostChannel }, { "/dev/nvhost-gpu", ProcessIoctlNvHostGpu },
{ "/dev/nvmap", ProcessIoctlNvMap } { "/dev/nvmap", ProcessIoctlNvMap }
}; };
public static GlobalStateTable Fds { get; private set; } public static GlobalStateTable Fds { get; private set; }
@ -44,6 +44,7 @@ namespace Ryujinx.HLE.OsHle.Services.Nv
{ 3, Initialize }, { 3, Initialize },
{ 4, QueryEvent }, { 4, QueryEvent },
{ 8, SetClientPid }, { 8, SetClientPid },
{ 11, Ioctl },
{ 13, FinishInitialize } { 13, FinishInitialize }
}; };
@ -162,9 +163,9 @@ namespace Ryujinx.HLE.OsHle.Services.Nv
return ProcessIoctl(Context, Cmd, NvGpuGpuIoctl.ProcessIoctl); return ProcessIoctl(Context, Cmd, NvGpuGpuIoctl.ProcessIoctl);
} }
private static int ProcessIoctlNvHostChannel(ServiceCtx Context, int Cmd) private static int ProcessIoctlNvHostGpu(ServiceCtx Context, int Cmd)
{ {
return ProcessIoctl(Context, Cmd, NvHostChannelIoctl.ProcessIoctl); return ProcessIoctl(Context, Cmd, NvHostChannelIoctl.ProcessIoctlGpu);
} }
private static int ProcessIoctlNvMap(ServiceCtx Context, int Cmd) private static int ProcessIoctlNvMap(ServiceCtx Context, int Cmd)
@ -207,6 +208,8 @@ namespace Ryujinx.HLE.OsHle.Services.Nv
NvGpuASIoctl.UnloadProcess(Process); NvGpuASIoctl.UnloadProcess(Process);
NvHostChannelIoctl.UnloadProcess(Process);
NvHostCtrlIoctl.UnloadProcess(Process); NvHostCtrlIoctl.UnloadProcess(Process);
NvMapIoctl.UnloadProcess(Process); NvMapIoctl.UnloadProcess(Process);

7
Ryujinx.HLE/OsHle/Services/Nv/NvHostChannel/NvChannel.cs Normal file
View file

@ -0,0 +1,7 @@
namespace Ryujinx.HLE.OsHle.Services.Nv.NvHostChannel
{
class NvChannel
{
public int Timeout;
}
}

7
Ryujinx.HLE/OsHle/Services/Nv/NvHostChannel/NvChannelName.cs Normal file
View file

@ -0,0 +1,7 @@
namespace Ryujinx.HLE.OsHle.Services.Nv.NvHostChannel
{
enum NvChannelName
{
Gpu
}
}

116
Ryujinx.HLE/OsHle/Services/Nv/NvHostChannel/NvHostChannelIoctl.cs
View file

@ -3,23 +3,50 @@ using Ryujinx.HLE.Gpu.Memory;
using Ryujinx.HLE.Logging; using Ryujinx.HLE.Logging;
using Ryujinx.HLE.OsHle.Services.Nv.NvGpuAS; using Ryujinx.HLE.OsHle.Services.Nv.NvGpuAS;
using System; using System;
using System.Collections.Concurrent;
namespace Ryujinx.HLE.OsHle.Services.Nv.NvHostChannel namespace Ryujinx.HLE.OsHle.Services.Nv.NvHostChannel
{ {
class NvHostChannelIoctl class NvHostChannelIoctl
{ {
public static int ProcessIoctl(ServiceCtx Context, int Cmd) private class ChannelsPerProcess
{
public ConcurrentDictionary<NvChannelName, NvChannel> Channels { get; private set; }
public ChannelsPerProcess()
{
Channels = new ConcurrentDictionary<NvChannelName, NvChannel>();
Channels.TryAdd(NvChannelName.Gpu, new NvChannel());
}
}
private static ConcurrentDictionary<Process, ChannelsPerProcess> Channels;
static NvHostChannelIoctl()
{
Channels = new ConcurrentDictionary<Process, ChannelsPerProcess>();
}
public static int ProcessIoctlGpu(ServiceCtx Context, int Cmd)
{
return ProcessIoctl(Context, NvChannelName.Gpu, Cmd);
}
public static int ProcessIoctl(ServiceCtx Context, NvChannelName Channel, int Cmd)
{ {
switch (Cmd & 0xffff) switch (Cmd & 0xffff)
{ {
case 0x4714: return SetUserData (Context); case 0x4714: return SetUserData (Context);
case 0x4801: return SetNvMap (Context); case 0x4801: return SetNvMap (Context);
case 0x4808: return SubmitGpfifo (Context); case 0x4803: return SetTimeout (Context, Channel);
case 0x4809: return AllocObjCtx (Context); case 0x4808: return SubmitGpfifo (Context);
case 0x480b: return ZcullBind (Context); case 0x4809: return AllocObjCtx (Context);
case 0x480c: return SetErrorNotifier(Context); case 0x480b: return ZcullBind (Context);
case 0x480d: return SetPriority (Context); case 0x480c: return SetErrorNotifier (Context);
case 0x481a: return AllocGpfifoEx2 (Context); case 0x480d: return SetPriority (Context);
case 0x481a: return AllocGpfifoEx2 (Context);
case 0x481b: return KickoffPbWithAttr(Context);
} }
throw new NotImplementedException(Cmd.ToString("x8")); throw new NotImplementedException(Cmd.ToString("x8"));
@ -45,6 +72,15 @@ namespace Ryujinx.HLE.OsHle.Services.Nv.NvHostChannel
return NvResult.Success; return NvResult.Success;
} }
private static int SetTimeout(ServiceCtx Context, NvChannelName Channel)
{
long InputPosition = Context.Request.GetBufferType0x21().Position;
GetChannel(Context, Channel).Timeout = Context.Memory.ReadInt32(InputPosition);
return NvResult.Success;
}
private static int SubmitGpfifo(ServiceCtx Context) private static int SubmitGpfifo(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21().Position; long InputPosition = Context.Request.GetBufferType0x21().Position;
@ -58,15 +94,7 @@ namespace Ryujinx.HLE.OsHle.Services.Nv.NvHostChannel
{ {
long Gpfifo = Context.Memory.ReadInt64(InputPosition + 0x18 + Index * 8); long Gpfifo = Context.Memory.ReadInt64(InputPosition + 0x18 + Index * 8);
long VA = Gpfifo & 0xff_ffff_ffff; PushGpfifo(Context, Vmm, Gpfifo);
int Size = (int)(Gpfifo >> 40) & 0x7ffffc;
byte[] Data = Vmm.ReadBytes(VA, Size);
NvGpuPBEntry[] PushBuffer = NvGpuPushBuffer.Decode(Data);
Context.Ns.Gpu.Fifo.PushBuffer(Vmm, PushBuffer);
} }
Args.SyncptId = 0; Args.SyncptId = 0;
@ -126,5 +154,57 @@ namespace Ryujinx.HLE.OsHle.Services.Nv.NvHostChannel
return NvResult.Success; return NvResult.Success;
} }
private static int KickoffPbWithAttr(ServiceCtx Context)
{
long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22().Position;
NvHostChannelSubmitGpfifo Args = AMemoryHelper.Read<NvHostChannelSubmitGpfifo>(Context.Memory, InputPosition);
NvGpuVmm Vmm = NvGpuASIoctl.GetVmm(Context);
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;
AMemoryHelper.Write(Context.Memory, OutputPosition, Args);
return NvResult.Success;
}
private static void PushGpfifo(ServiceCtx Context, NvGpuVmm Vmm, long Gpfifo)
{
long VA = Gpfifo & 0xff_ffff_ffff;
int Size = (int)(Gpfifo >> 40) & 0x7ffffc;
byte[] Data = Vmm.ReadBytes(VA, Size);
NvGpuPBEntry[] PushBuffer = NvGpuPushBuffer.Decode(Data);
Context.Ns.Gpu.Fifo.PushBuffer(Vmm, PushBuffer);
}
public static NvChannel GetChannel(ServiceCtx Context, NvChannelName Channel)
{
ChannelsPerProcess Cpp = Channels.GetOrAdd(Context.Process, (Key) =>
{
return new ChannelsPerProcess();
});
return Cpp.Channels[Channel];
}
public static void UnloadProcess(Process Process)
{
Channels.TryRemove(Process, out _);
}
} }
} }

2
Ryujinx.HLE/OsHle/Services/Nv/NvHostChannel/NvHostChannelSubmitGpfifo.cs
View file

@ -2,7 +2,7 @@ namespace Ryujinx.HLE.OsHle.Services.Nv.NvHostChannel
{ {
struct NvHostChannelSubmitGpfifo struct NvHostChannelSubmitGpfifo
{ {
public long Gpfifo; public long Address;
public int NumEntries; public int NumEntries;
public int Flags; public int Flags;
public int SyncptId; public int SyncptId;