OpenPunk/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-12-27 10:20:05 +00:00
Code Issues Projects Releases Wiki Activity

gpu: Use std::stop_token in WaitFence for VSync thread

Browse Source 
Fixes a hang that may occur when stopping emulation and the VSync thread is blocked on the syncpoint condition variable.
This commit is contained in:
ameerj 2022-01-03 12:31:33 -05:00
parent da8e0f6571
commit d866916f42
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/hle/service/nvflinger/nvflinger.cpp
View File

@ -266,10 +266,11 @@ void NVFlinger::Compose() {
auto& gpu = system.GPU(); auto& gpu = system.GPU();
const auto& multi_fence = buffer->get().multi_fence; const auto& multi_fence = buffer->get().multi_fence;
const auto stop_token = vsync_thread.get_stop_token();
guard->unlock(); guard->unlock();
for (u32 fence_id = 0; fence_id < multi_fence.num_fences; fence_id++) { for (u32 fence_id = 0; fence_id < multi_fence.num_fences; fence_id++) {
const auto& fence = multi_fence.fences[fence_id]; const auto& fence = multi_fence.fences[fence_id];
gpu.WaitFence(fence.id, fence.value); gpu.WaitFence(fence.id, fence.value, stop_token);
} }
guard->lock(); guard->lock();

19
src/video_core/gpu.cpp
View File

@ -206,7 +206,7 @@ struct GPU::Impl {
} }
/// Allows the CPU/NvFlinger to wait on the GPU before presenting a frame. /// Allows the CPU/NvFlinger to wait on the GPU before presenting a frame.
void WaitFence(u32 syncpoint_id, u32 value) { void WaitFence(u32 syncpoint_id, u32 value, std::stop_token stop_token = {}) {
// Synced GPU, is always in sync // Synced GPU, is always in sync
if (!is_async) { if (!is_async) {
return; return;
@ -218,13 +218,8 @@ struct GPU::Impl {
} }
MICROPROFILE_SCOPE(GPU_wait); MICROPROFILE_SCOPE(GPU_wait);
std::unique_lock lock{sync_mutex}; std::unique_lock lock{sync_mutex};
sync_cv.wait(lock, [=, this] { sync_cv.wait(lock, stop_token,
if (shutting_down.load(std::memory_order_relaxed)) { [=, this] { return syncpoints.at(syncpoint_id).load() >= value; });
// We're shutting down, ensure no threads continue to wait for the next syncpoint
return true;
}
return syncpoints.at(syncpoint_id).load() >= value;
});
} }
void IncrementSyncPoint(u32 syncpoint_id) { void IncrementSyncPoint(u32 syncpoint_id) {
@ -670,8 +665,6 @@ struct GPU::Impl {
std::unique_ptr<Engines::KeplerMemory> kepler_memory; std::unique_ptr<Engines::KeplerMemory> kepler_memory;
/// Shader build notifier /// Shader build notifier
std::unique_ptr<VideoCore::ShaderNotify> shader_notify; std::unique_ptr<VideoCore::ShaderNotify> shader_notify;
/// When true, we are about to shut down emulation session, so terminate outstanding tasks
std::atomic_bool shutting_down{};
std::array<std::atomic<u32>, Service::Nvidia::MaxSyncPoints> syncpoints{}; std::array<std::atomic<u32>, Service::Nvidia::MaxSyncPoints> syncpoints{};
@ -680,7 +673,7 @@ struct GPU::Impl {
std::mutex sync_mutex; std::mutex sync_mutex;
std::mutex device_mutex; std::mutex device_mutex;
std::condition_variable sync_cv; std::condition_variable_any sync_cv;
struct FlushRequest { struct FlushRequest {
explicit FlushRequest(u64 fence_, VAddr addr_, std::size_t size_) explicit FlushRequest(u64 fence_, VAddr addr_, std::size_t size_)
@ -819,8 +812,8 @@ const VideoCore::ShaderNotify& GPU::ShaderNotify() const {
return impl->ShaderNotify(); return impl->ShaderNotify();
} }
void GPU::WaitFence(u32 syncpoint_id, u32 value) { void GPU::WaitFence(u32 syncpoint_id, u32 value, std::stop_token stop_token) {
impl->WaitFence(syncpoint_id, value); impl->WaitFence(syncpoint_id, value, stop_token);
} }
void GPU::IncrementSyncPoint(u32 syncpoint_id) { void GPU::IncrementSyncPoint(u32 syncpoint_id) {

3
src/video_core/gpu.h
View File

@ -5,6 +5,7 @@
#pragma once #pragma once
#include <memory> #include <memory>
#include <stop_token>
#include "common/bit_field.h" #include "common/bit_field.h"
#include "common/common_types.h" #include "common/common_types.h"
@ -209,7 +210,7 @@ public:
[[nodiscard]] const VideoCore::ShaderNotify& ShaderNotify() const; [[nodiscard]] const VideoCore::ShaderNotify& ShaderNotify() const;
/// Allows the CPU/NvFlinger to wait on the GPU before presenting a frame. /// Allows the CPU/NvFlinger to wait on the GPU before presenting a frame.
void WaitFence(u32 syncpoint_id, u32 value); void WaitFence(u32 syncpoint_id, u32 value, std::stop_token stop_token = {});
void IncrementSyncPoint(u32 syncpoint_id); void IncrementSyncPoint(u32 syncpoint_id);