mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-03 16:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix copyGpuBuffers when resize invalidates commands in flight

Browse Source
This commit is contained in:
Frodo Baggins 2024-09-11 18:39:13 -07:00
parent 8a76cd888f
commit bd1b67492a
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/libraries/gnmdriver/gnmdriver.cpp
View File

@ -2667,6 +2667,10 @@ void RegisterlibSceGnmDriver(Core::Loader::SymbolsResolver* sym) {
sdk_version = 0; sdk_version = 0;
} }
if (Config::copyGPUCmdBuffers()) {
liverpool->reserveCopyBufferSpace();
}
Platform::IrqC::Instance()->Register(Platform::InterruptId::GpuIdle, ResetSubmissionLock, Platform::IrqC::Instance()->Register(Platform::InterruptId::GpuIdle, ResetSubmissionLock,
nullptr); nullptr);

6
src/video_core/amdgpu/liverpool.cpp
View File

@ -660,6 +660,12 @@ std::pair<std::span<const u32>, std::span<const u32>> Liverpool::CopyCmdBuffers(
std::span<const u32> dcb, std::span<const u32> ccb) { std::span<const u32> dcb, std::span<const u32> ccb) {
auto& queue = mapped_queues[GfxQueueId]; auto& queue = mapped_queues[GfxQueueId];
// std::vector resize can invalidate spans for commands in flight
ASSERT_MSG(queue.dcb_buffer.capacity() >= queue.dcb_buffer_offset + dcb.size(),
"dcb copy buffer out of reserved space");
ASSERT_MSG(queue.ccb_buffer.capacity() >= queue.ccb_buffer_offset + ccb.size(),
"ccb copy buffer out of reserved space");
queue.dcb_buffer.resize( queue.dcb_buffer.resize(
std::max(queue.dcb_buffer.size(), queue.dcb_buffer_offset + dcb.size())); std::max(queue.dcb_buffer.size(), queue.dcb_buffer_offset + dcb.size()));
queue.ccb_buffer.resize( queue.ccb_buffer.resize(

9
src/video_core/amdgpu/liverpool.h
View File

@ -1088,6 +1088,15 @@ public:
submit_cv.notify_one(); submit_cv.notify_one();
} }
void reserveCopyBufferSpace() {
GpuQueue& gfx_queue = mapped_queues[GfxQueueId];
std::scoped_lock<std::mutex> lk(gfx_queue.m_access);
constexpr size_t gfx_reserved_size = (2 << 21) / sizeof(u32); // 2MB
gfx_queue.ccb_buffer.reserve(gfx_reserved_size);
gfx_queue.dcb_buffer.reserve(gfx_reserved_size);
}
private: private:
struct Task { struct Task {
struct promise_type { struct promise_type {