summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-06-10 18:03:30 +0200
committerFernandoS27 <fsahmkow27@gmail.com>2019-07-05 21:49:22 +0200
commit24408cce9bd899a6709c03b25e318123f4de7371 (patch)
tree5d9bf14216dfbf7930ad953797ab46d02c2911dc /src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
parentgpu_asynch: Simplify synchronization to a simpler consumer->producer scheme. (diff)
downloadyuzu-24408cce9bd899a6709c03b25e318123f4de7371.tar
yuzu-24408cce9bd899a6709c03b25e318123f4de7371.tar.gz
yuzu-24408cce9bd899a6709c03b25e318123f4de7371.tar.bz2
yuzu-24408cce9bd899a6709c03b25e318123f4de7371.tar.lz
yuzu-24408cce9bd899a6709c03b25e318123f4de7371.tar.xz
yuzu-24408cce9bd899a6709c03b25e318123f4de7371.tar.zst
yuzu-24408cce9bd899a6709c03b25e318123f4de7371.zip
Diffstat (limited to 'src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp')
-rw-r--r--src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
index 96310ed83..02b078c2f 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
@@ -15,7 +15,8 @@
namespace Service::Nvidia::Devices {
-nvhost_ctrl::nvhost_ctrl(EventsInterface& events_interface) : events_interface{events_interface} {}
+nvhost_ctrl::nvhost_ctrl(Core::System& system, EventsInterface& events_interface)
+ : nvdevice(system), events_interface{events_interface} {}
nvhost_ctrl::~nvhost_ctrl() = default;
u32 nvhost_ctrl::ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) {
@@ -59,7 +60,7 @@ u32 nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>&
return NvResult::BadParameter;
}
- auto& gpu = Core::System::GetInstance().GPU();
+ auto& gpu = system.GPU();
// This is mostly to take into account unimplemented features. As synced
// gpu is always synced.
if (!gpu.IsAsync()) {
@@ -158,7 +159,7 @@ u32 nvhost_ctrl::IocCtrlEventSignal(const std::vector<u8>& input, std::vector<u8
return NvResult::BadParameter;
}
if (events_interface.status[event_id] == EventState::Waiting) {
- auto& gpu = Core::System::GetInstance().GPU();
+ auto& gpu = system.GPU();
gpu.CancelEvent(event_id, events_interface.assigned_syncpt[event_id],
events_interface.assigned_value[event_id]);
events_interface.LiberateEvent(event_id);