summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.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_gpu.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 '')
-rw-r--r--src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp
index 0e28755bd..c139f2ceb 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp
@@ -12,7 +12,7 @@
namespace Service::Nvidia::Devices {
-nvhost_ctrl_gpu::nvhost_ctrl_gpu() = default;
+nvhost_ctrl_gpu::nvhost_ctrl_gpu(Core::System& system) : nvdevice(system){};
nvhost_ctrl_gpu::~nvhost_ctrl_gpu() = default;
u32 nvhost_ctrl_gpu::ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) {
@@ -185,7 +185,7 @@ u32 nvhost_ctrl_gpu::GetGpuTime(const std::vector<u8>& input, std::vector<u8>& o
IoctlGetGpuTime params{};
std::memcpy(&params, input.data(), input.size());
- const auto ns = Core::Timing::CyclesToNs(Core::System::GetInstance().CoreTiming().GetTicks());
+ const auto ns = Core::Timing::CyclesToNs(system.CoreTiming().GetTicks());
params.gpu_time = static_cast<u64_le>(ns.count());
std::memcpy(output.data(), &params, output.size());
return 0;