mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-08-17 14:18:44 +02:00
hle: Handle GPU profiler and debugger device path correctly (#4138)
This fix a warning on "慟哭そして…" by handling correctly the debug mode flag. When debug mode isn't enabled, opening /dev/nvhost-dbg-gpu or /dev/nvhost-prof-gpu should fail with a not implemented error code. This implement this behaviour and also define stubbed interfaces for completness.
This commit is contained in:
parent
cb70e7bb30
commit
479d1fd8b0
4 changed files with 52 additions and 17 deletions
|
@ -8,6 +8,8 @@ using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostAsGpu;
|
||||||
using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostChannel;
|
using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostChannel;
|
||||||
using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostCtrl;
|
using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostCtrl;
|
||||||
using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostCtrlGpu;
|
using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostCtrlGpu;
|
||||||
|
using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostDbgGpu;
|
||||||
|
using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostProfGpu;
|
||||||
using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvMap;
|
using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvMap;
|
||||||
using Ryujinx.HLE.HOS.Services.Nv.Types;
|
using Ryujinx.HLE.HOS.Services.Nv.Types;
|
||||||
using Ryujinx.Memory;
|
using Ryujinx.Memory;
|
||||||
|
@ -23,7 +25,13 @@ namespace Ryujinx.HLE.HOS.Services.Nv
|
||||||
[Service("nvdrv:t")]
|
[Service("nvdrv:t")]
|
||||||
class INvDrvServices : IpcService
|
class INvDrvServices : IpcService
|
||||||
{
|
{
|
||||||
private static Dictionary<string, Type> _deviceFileRegistry = new Dictionary<string, Type>()
|
private static readonly List<string> _deviceFileDebugRegistry = new List<string>()
|
||||||
|
{
|
||||||
|
"/dev/nvhost-dbg-gpu",
|
||||||
|
"/dev/nvhost-prof-gpu"
|
||||||
|
};
|
||||||
|
|
||||||
|
private static readonly Dictionary<string, Type> _deviceFileRegistry = new Dictionary<string, Type>()
|
||||||
{
|
{
|
||||||
{ "/dev/nvmap", typeof(NvMapDeviceFile) },
|
{ "/dev/nvmap", typeof(NvMapDeviceFile) },
|
||||||
{ "/dev/nvhost-ctrl", typeof(NvHostCtrlDeviceFile) },
|
{ "/dev/nvhost-ctrl", typeof(NvHostCtrlDeviceFile) },
|
||||||
|
@ -35,6 +43,8 @@ namespace Ryujinx.HLE.HOS.Services.Nv
|
||||||
//{ "/dev/nvhost-nvjpg", typeof(NvHostChannelDeviceFile) },
|
//{ "/dev/nvhost-nvjpg", typeof(NvHostChannelDeviceFile) },
|
||||||
{ "/dev/nvhost-vic", typeof(NvHostChannelDeviceFile) },
|
{ "/dev/nvhost-vic", typeof(NvHostChannelDeviceFile) },
|
||||||
//{ "/dev/nvhost-display", typeof(NvHostChannelDeviceFile) },
|
//{ "/dev/nvhost-display", typeof(NvHostChannelDeviceFile) },
|
||||||
|
{ "/dev/nvhost-dbg-gpu", typeof(NvHostDbgGpuDeviceFile) },
|
||||||
|
{ "/dev/nvhost-prof-gpu", typeof(NvHostProfGpuDeviceFile) },
|
||||||
};
|
};
|
||||||
|
|
||||||
public static IdDictionary DeviceFileIdRegistry = new IdDictionary();
|
public static IdDictionary DeviceFileIdRegistry = new IdDictionary();
|
||||||
|
@ -44,13 +54,23 @@ namespace Ryujinx.HLE.HOS.Services.Nv
|
||||||
|
|
||||||
private bool _transferMemInitialized = false;
|
private bool _transferMemInitialized = false;
|
||||||
|
|
||||||
|
// TODO: This should call set:sys::GetDebugModeFlag
|
||||||
|
private bool _debugModeEnabled = false;
|
||||||
|
|
||||||
public INvDrvServices(ServiceCtx context) : base(context.Device.System.NvDrvServer)
|
public INvDrvServices(ServiceCtx context) : base(context.Device.System.NvDrvServer)
|
||||||
{
|
{
|
||||||
_owner = 0;
|
_owner = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
private int Open(ServiceCtx context, string path)
|
private NvResult Open(ServiceCtx context, string path, out int fd)
|
||||||
{
|
{
|
||||||
|
fd = -1;
|
||||||
|
|
||||||
|
if (!_debugModeEnabled && _deviceFileDebugRegistry.Contains(path))
|
||||||
|
{
|
||||||
|
return NvResult.NotSupported;
|
||||||
|
}
|
||||||
|
|
||||||
if (_deviceFileRegistry.TryGetValue(path, out Type deviceFileClass))
|
if (_deviceFileRegistry.TryGetValue(path, out Type deviceFileClass))
|
||||||
{
|
{
|
||||||
ConstructorInfo constructor = deviceFileClass.GetConstructor(new Type[] { typeof(ServiceCtx), typeof(IVirtualMemoryManager), typeof(ulong) });
|
ConstructorInfo constructor = deviceFileClass.GetConstructor(new Type[] { typeof(ServiceCtx), typeof(IVirtualMemoryManager), typeof(ulong) });
|
||||||
|
@ -59,14 +79,14 @@ namespace Ryujinx.HLE.HOS.Services.Nv
|
||||||
|
|
||||||
deviceFile.Path = path;
|
deviceFile.Path = path;
|
||||||
|
|
||||||
return DeviceFileIdRegistry.Add(deviceFile);
|
fd = DeviceFileIdRegistry.Add(deviceFile);
|
||||||
}
|
|
||||||
else
|
return NvResult.Success;
|
||||||
{
|
|
||||||
Logger.Warning?.Print(LogClass.ServiceNv, $"Cannot find file device \"{path}\"!");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return -1;
|
Logger.Warning?.Print(LogClass.ServiceNv, $"Cannot find file device \"{path}\"!");
|
||||||
|
|
||||||
|
return NvResult.FileOperationFailed;
|
||||||
}
|
}
|
||||||
|
|
||||||
private NvResult GetIoctlArgument(ServiceCtx context, NvIoctl ioctlCommand, out Span<byte> arguments)
|
private NvResult GetIoctlArgument(ServiceCtx context, NvIoctl ioctlCommand, out Span<byte> arguments)
|
||||||
|
@ -229,12 +249,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv
|
||||||
|
|
||||||
string path = MemoryHelper.ReadAsciiString(context.Memory, pathPtr, (long)pathSize);
|
string path = MemoryHelper.ReadAsciiString(context.Memory, pathPtr, (long)pathSize);
|
||||||
|
|
||||||
fd = Open(context, path);
|
errorCode = Open(context, path, out fd);
|
||||||
|
|
||||||
if (fd == -1)
|
|
||||||
{
|
|
||||||
errorCode = NvResult.FileOperationFailed;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
context.ResponseData.Write(fd);
|
context.ResponseData.Write(fd);
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
using Ryujinx.Memory;
|
||||||
|
using System;
|
||||||
|
namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostDbgGpu
|
||||||
|
{
|
||||||
|
class NvHostDbgGpuDeviceFile : NvDeviceFile
|
||||||
|
{
|
||||||
|
public NvHostDbgGpuDeviceFile(ServiceCtx context, IVirtualMemoryManager memory, ulong owner) : base(context, owner) { }
|
||||||
|
|
||||||
|
public override void Close() { }
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,11 @@
|
||||||
|
using Ryujinx.Memory;
|
||||||
|
|
||||||
|
namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostProfGpu
|
||||||
|
{
|
||||||
|
class NvHostProfGpuDeviceFile : NvDeviceFile
|
||||||
|
{
|
||||||
|
public NvHostProfGpuDeviceFile(ServiceCtx context, IVirtualMemoryManager memory, ulong owner) : base(context, owner) { }
|
||||||
|
|
||||||
|
public override void Close() { }
|
||||||
|
}
|
||||||
|
}
|
|
@ -11,9 +11,7 @@
|
||||||
<ProjectReference Include="..\Ryujinx.Graphics.Host1x\Ryujinx.Graphics.Host1x.csproj" />
|
<ProjectReference Include="..\Ryujinx.Graphics.Host1x\Ryujinx.Graphics.Host1x.csproj" />
|
||||||
<ProjectReference Include="..\Ryujinx.Graphics.Nvdec\Ryujinx.Graphics.Nvdec.csproj" />
|
<ProjectReference Include="..\Ryujinx.Graphics.Nvdec\Ryujinx.Graphics.Nvdec.csproj" />
|
||||||
<ProjectReference Include="..\Ryujinx.Graphics.Vic\Ryujinx.Graphics.Vic.csproj" />
|
<ProjectReference Include="..\Ryujinx.Graphics.Vic\Ryujinx.Graphics.Vic.csproj" />
|
||||||
<ProjectReference Include="..\Ryujinx.Horizon.Generators\Ryujinx.Horizon.Generators.csproj"
|
<ProjectReference Include="..\Ryujinx.Horizon.Generators\Ryujinx.Horizon.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
|
||||||
OutputItemType="Analyzer"
|
|
||||||
ReferenceOutputAssembly="false" />
|
|
||||||
<ProjectReference Include="..\Ryujinx.Memory\Ryujinx.Memory.csproj" />
|
<ProjectReference Include="..\Ryujinx.Memory\Ryujinx.Memory.csproj" />
|
||||||
<ProjectReference Include="..\ARMeilleure\ARMeilleure.csproj" />
|
<ProjectReference Include="..\ARMeilleure\ARMeilleure.csproj" />
|
||||||
<ProjectReference Include="..\Ryujinx.Graphics.Gpu\Ryujinx.Graphics.Gpu.csproj" />
|
<ProjectReference Include="..\Ryujinx.Graphics.Gpu\Ryujinx.Graphics.Gpu.csproj" />
|
||||||
|
|
Loading…
Reference in a new issue