mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-07 18:09:09 +01:00
nvdrv: convert nvhost_ctrl
This commit is contained in:
parent
4df063209b
commit
789d9c8af9
2 changed files with 29 additions and 34 deletions
|
@ -14,6 +14,7 @@
|
||||||
#include "core/hle/kernel/k_event.h"
|
#include "core/hle/kernel/k_event.h"
|
||||||
#include "core/hle/service/nvdrv/core/container.h"
|
#include "core/hle/service/nvdrv/core/container.h"
|
||||||
#include "core/hle/service/nvdrv/core/syncpoint_manager.h"
|
#include "core/hle/service/nvdrv/core/syncpoint_manager.h"
|
||||||
|
#include "core/hle/service/nvdrv/devices/ioctl_serialization.h"
|
||||||
#include "core/hle/service/nvdrv/devices/nvhost_ctrl.h"
|
#include "core/hle/service/nvdrv/devices/nvhost_ctrl.h"
|
||||||
#include "video_core/gpu.h"
|
#include "video_core/gpu.h"
|
||||||
#include "video_core/host1x/host1x.h"
|
#include "video_core/host1x/host1x.h"
|
||||||
|
@ -40,19 +41,19 @@ NvResult nvhost_ctrl::Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> inp
|
||||||
case 0x0:
|
case 0x0:
|
||||||
switch (command.cmd) {
|
switch (command.cmd) {
|
||||||
case 0x1b:
|
case 0x1b:
|
||||||
return NvOsGetConfigU32(input, output);
|
return Wrap1(&nvhost_ctrl::NvOsGetConfigU32, input, output);
|
||||||
case 0x1c:
|
case 0x1c:
|
||||||
return IocCtrlClearEventWait(input, output);
|
return Wrap1(&nvhost_ctrl::IocCtrlClearEventWait, input, output);
|
||||||
case 0x1d:
|
case 0x1d:
|
||||||
return IocCtrlEventWait(input, output, true);
|
return Wrap1(&nvhost_ctrl::IocCtrlEventWaitWithAllocation, input, output);
|
||||||
case 0x1e:
|
case 0x1e:
|
||||||
return IocCtrlEventWait(input, output, false);
|
return Wrap1(&nvhost_ctrl::IocCtrlEventWaitNotAllocation, input, output);
|
||||||
case 0x1f:
|
case 0x1f:
|
||||||
return IocCtrlEventRegister(input, output);
|
return Wrap1(&nvhost_ctrl::IocCtrlEventRegister, input, output);
|
||||||
case 0x20:
|
case 0x20:
|
||||||
return IocCtrlEventUnregister(input, output);
|
return Wrap1(&nvhost_ctrl::IocCtrlEventUnregister, input, output);
|
||||||
case 0x21:
|
case 0x21:
|
||||||
return IocCtrlEventUnregisterBatch(input, output);
|
return Wrap1(&nvhost_ctrl::IocCtrlEventUnregisterBatch, input, output);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -79,25 +80,19 @@ void nvhost_ctrl::OnOpen(DeviceFD fd) {}
|
||||||
|
|
||||||
void nvhost_ctrl::OnClose(DeviceFD fd) {}
|
void nvhost_ctrl::OnClose(DeviceFD fd) {}
|
||||||
|
|
||||||
NvResult nvhost_ctrl::NvOsGetConfigU32(std::span<const u8> input, std::span<u8> output) {
|
NvResult nvhost_ctrl::NvOsGetConfigU32(IocGetConfigParams& params) {
|
||||||
IocGetConfigParams params{};
|
|
||||||
std::memcpy(¶ms, input.data(), sizeof(params));
|
|
||||||
LOG_TRACE(Service_NVDRV, "called, setting={}!{}", params.domain_str.data(),
|
LOG_TRACE(Service_NVDRV, "called, setting={}!{}", params.domain_str.data(),
|
||||||
params.param_str.data());
|
params.param_str.data());
|
||||||
return NvResult::ConfigVarNotFound; // Returns error on production mode
|
return NvResult::ConfigVarNotFound; // Returns error on production mode
|
||||||
}
|
}
|
||||||
|
|
||||||
NvResult nvhost_ctrl::IocCtrlEventWait(std::span<const u8> input, std::span<u8> output,
|
NvResult nvhost_ctrl::IocCtrlEventWaitImpl(IocCtrlEventWaitParams& params, bool is_allocation) {
|
||||||
bool is_allocation) {
|
|
||||||
IocCtrlEventWaitParams params{};
|
|
||||||
std::memcpy(¶ms, input.data(), sizeof(params));
|
|
||||||
LOG_DEBUG(Service_NVDRV, "syncpt_id={}, threshold={}, timeout={}, is_allocation={}",
|
LOG_DEBUG(Service_NVDRV, "syncpt_id={}, threshold={}, timeout={}, is_allocation={}",
|
||||||
params.fence.id, params.fence.value, params.timeout, is_allocation);
|
params.fence.id, params.fence.value, params.timeout, is_allocation);
|
||||||
|
|
||||||
bool must_unmark_fail = !is_allocation;
|
bool must_unmark_fail = !is_allocation;
|
||||||
const u32 event_id = params.value.raw;
|
const u32 event_id = params.value.raw;
|
||||||
SCOPE_EXIT({
|
SCOPE_EXIT({
|
||||||
std::memcpy(output.data(), ¶ms, sizeof(params));
|
|
||||||
if (must_unmark_fail) {
|
if (must_unmark_fail) {
|
||||||
events[event_id].fails = 0;
|
events[event_id].fails = 0;
|
||||||
}
|
}
|
||||||
|
@ -231,9 +226,7 @@ NvResult nvhost_ctrl::FreeEvent(u32 slot) {
|
||||||
return NvResult::Success;
|
return NvResult::Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
NvResult nvhost_ctrl::IocCtrlEventRegister(std::span<const u8> input, std::span<u8> output) {
|
NvResult nvhost_ctrl::IocCtrlEventRegister(IocCtrlEventRegisterParams& params) {
|
||||||
IocCtrlEventRegisterParams params{};
|
|
||||||
std::memcpy(¶ms, input.data(), sizeof(params));
|
|
||||||
const u32 event_id = params.user_event_id;
|
const u32 event_id = params.user_event_id;
|
||||||
LOG_DEBUG(Service_NVDRV, " called, user_event_id: {:X}", event_id);
|
LOG_DEBUG(Service_NVDRV, " called, user_event_id: {:X}", event_id);
|
||||||
if (event_id >= MaxNvEvents) {
|
if (event_id >= MaxNvEvents) {
|
||||||
|
@ -252,9 +245,7 @@ NvResult nvhost_ctrl::IocCtrlEventRegister(std::span<const u8> input, std::span<
|
||||||
return NvResult::Success;
|
return NvResult::Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
NvResult nvhost_ctrl::IocCtrlEventUnregister(std::span<const u8> input, std::span<u8> output) {
|
NvResult nvhost_ctrl::IocCtrlEventUnregister(IocCtrlEventUnregisterParams& params) {
|
||||||
IocCtrlEventUnregisterParams params{};
|
|
||||||
std::memcpy(¶ms, input.data(), sizeof(params));
|
|
||||||
const u32 event_id = params.user_event_id & 0x00FF;
|
const u32 event_id = params.user_event_id & 0x00FF;
|
||||||
LOG_DEBUG(Service_NVDRV, " called, user_event_id: {:X}", event_id);
|
LOG_DEBUG(Service_NVDRV, " called, user_event_id: {:X}", event_id);
|
||||||
|
|
||||||
|
@ -262,9 +253,7 @@ NvResult nvhost_ctrl::IocCtrlEventUnregister(std::span<const u8> input, std::spa
|
||||||
return FreeEvent(event_id);
|
return FreeEvent(event_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
NvResult nvhost_ctrl::IocCtrlEventUnregisterBatch(std::span<const u8> input, std::span<u8> output) {
|
NvResult nvhost_ctrl::IocCtrlEventUnregisterBatch(IocCtrlEventUnregisterBatchParams& params) {
|
||||||
IocCtrlEventUnregisterBatchParams params{};
|
|
||||||
std::memcpy(¶ms, input.data(), sizeof(params));
|
|
||||||
u64 event_mask = params.user_events;
|
u64 event_mask = params.user_events;
|
||||||
LOG_DEBUG(Service_NVDRV, " called, event_mask: {:X}", event_mask);
|
LOG_DEBUG(Service_NVDRV, " called, event_mask: {:X}", event_mask);
|
||||||
|
|
||||||
|
@ -280,10 +269,7 @@ NvResult nvhost_ctrl::IocCtrlEventUnregisterBatch(std::span<const u8> input, std
|
||||||
return NvResult::Success;
|
return NvResult::Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
NvResult nvhost_ctrl::IocCtrlClearEventWait(std::span<const u8> input, std::span<u8> output) {
|
NvResult nvhost_ctrl::IocCtrlClearEventWait(IocCtrlEventClearParams& params) {
|
||||||
IocCtrlEventClearParams params{};
|
|
||||||
std::memcpy(¶ms, input.data(), sizeof(params));
|
|
||||||
|
|
||||||
u32 event_id = params.event_id.slot;
|
u32 event_id = params.event_id.slot;
|
||||||
LOG_DEBUG(Service_NVDRV, "called, event_id: {:X}", event_id);
|
LOG_DEBUG(Service_NVDRV, "called, event_id: {:X}", event_id);
|
||||||
|
|
||||||
|
|
|
@ -186,15 +186,24 @@ private:
|
||||||
static_assert(sizeof(IocCtrlEventUnregisterBatchParams) == 8,
|
static_assert(sizeof(IocCtrlEventUnregisterBatchParams) == 8,
|
||||||
"IocCtrlEventKill is incorrect size");
|
"IocCtrlEventKill is incorrect size");
|
||||||
|
|
||||||
NvResult NvOsGetConfigU32(std::span<const u8> input, std::span<u8> output);
|
NvResult NvOsGetConfigU32(IocGetConfigParams& params);
|
||||||
NvResult IocCtrlEventWait(std::span<const u8> input, std::span<u8> output, bool is_allocation);
|
NvResult IocCtrlEventRegister(IocCtrlEventRegisterParams& params);
|
||||||
NvResult IocCtrlEventRegister(std::span<const u8> input, std::span<u8> output);
|
NvResult IocCtrlEventUnregister(IocCtrlEventUnregisterParams& params);
|
||||||
NvResult IocCtrlEventUnregister(std::span<const u8> input, std::span<u8> output);
|
NvResult IocCtrlEventUnregisterBatch(IocCtrlEventUnregisterBatchParams& params);
|
||||||
NvResult IocCtrlEventUnregisterBatch(std::span<const u8> input, std::span<u8> output);
|
NvResult IocCtrlClearEventWait(IocCtrlEventClearParams& params);
|
||||||
NvResult IocCtrlClearEventWait(std::span<const u8> input, std::span<u8> output);
|
|
||||||
|
|
||||||
NvResult FreeEvent(u32 slot);
|
NvResult FreeEvent(u32 slot);
|
||||||
|
|
||||||
|
// TODO: these are not the correct names
|
||||||
|
NvResult IocCtrlEventWaitNotAllocation(IocCtrlEventWaitParams& params) {
|
||||||
|
return this->IocCtrlEventWaitImpl(params, false);
|
||||||
|
}
|
||||||
|
NvResult IocCtrlEventWaitWithAllocation(IocCtrlEventWaitParams& params) {
|
||||||
|
return this->IocCtrlEventWaitImpl(params, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
NvResult IocCtrlEventWaitImpl(IocCtrlEventWaitParams& params, bool is_allocation);
|
||||||
|
|
||||||
EventInterface& events_interface;
|
EventInterface& events_interface;
|
||||||
NvCore::Container& core;
|
NvCore::Container& core;
|
||||||
NvCore::SyncpointManager& syncpoint_manager;
|
NvCore::SyncpointManager& syncpoint_manager;
|
||||||
|
|
Loading…
Reference in a new issue