yuzu-emu/yuzu-mainline
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-mainline.git synced 2024-12-12 16:44:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

nvnflinger: fix lost wakeup

Browse Source
This commit is contained in:
Liam 2022-11-14 21:00:32 -05:00
parent 040a01a5dd
commit cf202f3718
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/hle/service/nvflinger/buffer_queue_core.cpp
View File

@ -23,15 +23,17 @@ void BufferQueueCore::NotifyShutdown() {
} }
void BufferQueueCore::SignalDequeueCondition() { void BufferQueueCore::SignalDequeueCondition() {
dequeue_possible.store(true);
dequeue_condition.notify_all(); dequeue_condition.notify_all();
} }
bool BufferQueueCore::WaitForDequeueCondition() { bool BufferQueueCore::WaitForDequeueCondition(std::unique_lock<std::mutex>& lk) {
if (is_shutting_down) { if (is_shutting_down) {
return false; return false;
} }
dequeue_condition.wait(mutex); dequeue_condition.wait(lk, [&] { return dequeue_possible.load(); });
dequeue_possible.store(false);
return true; return true;
} }

5
src/core/hle/service/nvflinger/buffer_queue_core.h
View File

@ -38,7 +38,7 @@ public:
private: private:
void SignalDequeueCondition(); void SignalDequeueCondition();
bool WaitForDequeueCondition(); bool WaitForDequeueCondition(std::unique_lock<std::mutex>& lk);
s32 GetMinUndequeuedBufferCountLocked(bool async) const; s32 GetMinUndequeuedBufferCountLocked(bool async) const;
s32 GetMinMaxBufferCountLocked(bool async) const; s32 GetMinMaxBufferCountLocked(bool async) const;
@ -60,7 +60,8 @@ private:
BufferQueueDefs::SlotsType slots{}; BufferQueueDefs::SlotsType slots{};
std::vector<BufferItem> queue; std::vector<BufferItem> queue;
s32 override_max_buffer_count{}; s32 override_max_buffer_count{};
mutable std::condition_variable_any dequeue_condition; std::condition_variable dequeue_condition;
std::atomic<bool> dequeue_possible{};
const bool use_async_buffer{}; // This is always disabled on HOS const bool use_async_buffer{}; // This is always disabled on HOS
bool dequeue_buffer_cannot_block{}; bool dequeue_buffer_cannot_block{};
PixelFormat default_buffer_format{PixelFormat::Rgba8888}; PixelFormat default_buffer_format{PixelFormat::Rgba8888};

14
src/core/hle/service/nvflinger/buffer_queue_producer.cpp
View File

@ -121,8 +121,8 @@ Status BufferQueueProducer::SetBufferCount(s32 buffer_count) {
return Status::NoError; return Status::NoError;
} }
Status BufferQueueProducer::WaitForFreeSlotThenRelock(bool async, s32* found, Status BufferQueueProducer::WaitForFreeSlotThenRelock(bool async, s32* found, Status* return_flags,
Status* return_flags) const { std::unique_lock<std::mutex>& lk) const {
bool try_again = true; bool try_again = true;
while (try_again) { while (try_again) {
@ -214,7 +214,7 @@ Status BufferQueueProducer::WaitForFreeSlotThenRelock(bool async, s32* found,
return Status::WouldBlock; return Status::WouldBlock;
} }
if (!core->WaitForDequeueCondition()) { if (!core->WaitForDequeueCondition(lk)) {
// We are no longer running // We are no longer running
return Status::NoError; return Status::NoError;
} }
@ -237,7 +237,7 @@ Status BufferQueueProducer::DequeueBuffer(s32* out_slot, Fence* out_fence, bool
Status return_flags = Status::NoError; Status return_flags = Status::NoError;
bool attached_by_consumer = false; bool attached_by_consumer = false;
{ {
std::scoped_lock lock{core->mutex}; std::unique_lock lock{core->mutex};
core->WaitWhileAllocatingLocked(); core->WaitWhileAllocatingLocked();
if (format == PixelFormat::NoFormat) { if (format == PixelFormat::NoFormat) {
@ -248,7 +248,7 @@ Status BufferQueueProducer::DequeueBuffer(s32* out_slot, Fence* out_fence, bool
usage |= core->consumer_usage_bit; usage |= core->consumer_usage_bit;
s32 found{}; s32 found{};
Status status = WaitForFreeSlotThenRelock(async, &found, &return_flags); Status status = WaitForFreeSlotThenRelock(async, &found, &return_flags, lock);
if (status != Status::NoError) { if (status != Status::NoError) {
return status; return status;
} }
@ -400,13 +400,13 @@ Status BufferQueueProducer::AttachBuffer(s32* out_slot,
return Status::BadValue; return Status::BadValue;
} }
std::scoped_lock lock{core->mutex}; std::unique_lock lock{core->mutex};
core->WaitWhileAllocatingLocked(); core->WaitWhileAllocatingLocked();
Status return_flags = Status::NoError; Status return_flags = Status::NoError;
s32 found{}; s32 found{};
const auto status = WaitForFreeSlotThenRelock(false, &found, &return_flags); const auto status = WaitForFreeSlotThenRelock(false, &found, &return_flags, lock);
if (status != Status::NoError) { if (status != Status::NoError) {
return status; return status;
} }

3
src/core/hle/service/nvflinger/buffer_queue_producer.h
View File

@ -70,7 +70,8 @@ public:
private: private:
BufferQueueProducer(const BufferQueueProducer&) = delete; BufferQueueProducer(const BufferQueueProducer&) = delete;
Status WaitForFreeSlotThenRelock(bool async, s32* found, Status* return_flags) const; Status WaitForFreeSlotThenRelock(bool async, s32* found, Status* return_flags,
std::unique_lock<std::mutex>& lk) const;
Kernel::KEvent* buffer_wait_event{}; Kernel::KEvent* buffer_wait_event{};
Service::KernelHelpers::ServiceContext& service_context; Service::KernelHelpers::ServiceContext& service_context;