diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-02-15 23:42:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-15 23:42:45 +0100 |
commit | 6d77de96dae4763ef78fdea1918b582e5e181653 (patch) | |
tree | 0c131de68a68c23f62a8a253b3cf69d3bfc91ee7 /src/core/hle/service/nvdrv | |
parent | Merge pull request #9782 from arades79/fix-consexpr-value-declaration-usage (diff) | |
parent | general: rename CurrentProcess to ApplicationProcess (diff) | |
download | yuzu-6d77de96dae4763ef78fdea1918b582e5e181653.tar yuzu-6d77de96dae4763ef78fdea1918b582e5e181653.tar.gz yuzu-6d77de96dae4763ef78fdea1918b582e5e181653.tar.bz2 yuzu-6d77de96dae4763ef78fdea1918b582e5e181653.tar.lz yuzu-6d77de96dae4763ef78fdea1918b582e5e181653.tar.xz yuzu-6d77de96dae4763ef78fdea1918b582e5e181653.tar.zst yuzu-6d77de96dae4763ef78fdea1918b582e5e181653.zip |
Diffstat (limited to 'src/core/hle/service/nvdrv')
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp | 4 | ||||
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvmap.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp index 0cdde82a7..e12025560 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp @@ -150,9 +150,9 @@ NvResult nvhost_ctrl::IocCtrlEventWait(std::span<const u8> input, std::vector<u8 const auto check_failing = [&]() { if (events[slot].fails > 2) { { - auto lk = system.StallProcesses(); + auto lk = system.StallApplication(); host1x_syncpoint_manager.WaitHost(fence_id, target_value); - system.UnstallProcesses(); + system.UnstallApplication(); } params.value.raw = target_value; return true; diff --git a/src/core/hle/service/nvdrv/devices/nvmap.cpp b/src/core/hle/service/nvdrv/devices/nvmap.cpp index 29c1e0f01..277afe0b4 100644 --- a/src/core/hle/service/nvdrv/devices/nvmap.cpp +++ b/src/core/hle/service/nvdrv/devices/nvmap.cpp @@ -127,7 +127,7 @@ NvResult nvmap::IocAlloc(std::span<const u8> input, std::vector<u8>& output) { return result; } bool is_out_io{}; - ASSERT(system.CurrentProcess() + ASSERT(system.ApplicationProcess() ->PageTable() .LockForMapDeviceAddressSpace(&is_out_io, handle_description->address, handle_description->size, @@ -254,7 +254,7 @@ NvResult nvmap::IocFree(std::span<const u8> input, std::vector<u8>& output) { if (auto freeInfo{file.FreeHandle(params.handle, false)}) { if (freeInfo->can_unlock) { - ASSERT(system.CurrentProcess() + ASSERT(system.ApplicationProcess() ->PageTable() .UnlockForDeviceAddressSpace(freeInfo->address, freeInfo->size) .IsSuccess()); |