GitHub/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-29 14:35:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixup GpuChannel::SetNvmapFd to take an FD rather than an nvmap handle

Browse Source
This commit is contained in:
Billy Laws 2021-10-23 14:40:42 +01:00 committed by PixelyIon
parent 386a3447a8
commit eb6f052873
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/cpp/skyline/services/nvdrv/devices/nvhost/gpu_channel.cpp
View File

@ -65,8 +65,8 @@ namespace skyline::service::nvdrv::device::nvhost {
mem[offset++] = (fence.id << 8) | 0x1; mem[offset++] = (fence.id << 8) | 0x1;
} }
PosixResult GpuChannel::SetNvmapFd(In<core::NvMap::Handle::Id> id) { PosixResult GpuChannel::SetNvmapFd(In<FileDescriptor> fd) {
state.logger->Debug("id: {}", id); state.logger->Debug("fd: {}", fd);
return PosixResult::Success; return PosixResult::Success;
} }
@ -224,7 +224,7 @@ namespace skyline::service::nvdrv::device::nvhost {
VARIABLE_IOCTL_HANDLER_FUNC(GpuChannel, ({ VARIABLE_IOCTL_HANDLER_FUNC(GpuChannel, ({
IOCTL_CASE_ARGS(IN, SIZE(0x4), MAGIC(GpuChannelMagic), FUNC(0x1), IOCTL_CASE_ARGS(IN, SIZE(0x4), MAGIC(GpuChannelMagic), FUNC(0x1),
SetNvmapFd, ARGS(In<core::NvMap::Handle::Id>)) SetNvmapFd, ARGS(In<FileDescriptor>))
IOCTL_CASE_ARGS(IN, SIZE(0x4), MAGIC(GpuChannelMagic), FUNC(0x3), IOCTL_CASE_ARGS(IN, SIZE(0x4), MAGIC(GpuChannelMagic), FUNC(0x3),
SetTimeout, ARGS(In<u32>)) SetTimeout, ARGS(In<u32>))
IOCTL_CASE_ARGS(INOUT, SIZE(0x10), MAGIC(GpuChannelMagic), FUNC(0x9), IOCTL_CASE_ARGS(INOUT, SIZE(0x10), MAGIC(GpuChannelMagic), FUNC(0x9),

2
app/src/main/cpp/skyline/services/nvdrv/devices/nvhost/gpu_channel.h
View File

@ -57,7 +57,7 @@ namespace skyline::service::nvdrv::device::nvhost {
* @brief Sets the nvmap handle id to be used for channel submits (does nothing for GPU channels) * @brief Sets the nvmap handle id to be used for channel submits (does nothing for GPU channels)
* @url https://switchbrew.org/wiki/NV_services#NVGPU_IOCTL_CHANNEL_SET_NVMAP_FD * @url https://switchbrew.org/wiki/NV_services#NVGPU_IOCTL_CHANNEL_SET_NVMAP_FD
*/ */
PosixResult SetNvmapFd(In<core::NvMap::Handle::Id> id); PosixResult SetNvmapFd(In<FileDescriptor> id);
/** /**
* @brief Sets the timeout for channel submits * @brief Sets the timeout for channel submits