From 64b2e582850c85b0a4c54fc03baa71fb8ee03886 Mon Sep 17 00:00:00 2001 From: psucien Date: Fri, 17 May 2024 08:47:38 +0200 Subject: [PATCH] a fair multi-submissions support --- src/core/libraries/gnmdriver/gnmdriver.cpp | 21 +++++++++++++-------- src/core/libraries/gnmdriver/gnmdriver.h | 8 ++++---- src/video_core/amdgpu/liverpool.h | 7 +++++-- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/core/libraries/gnmdriver/gnmdriver.cpp b/src/core/libraries/gnmdriver/gnmdriver.cpp index 659c0a5f..5cb7f5a9 100644 --- a/src/core/libraries/gnmdriver/gnmdriver.cpp +++ b/src/core/libraries/gnmdriver/gnmdriver.cpp @@ -1359,13 +1359,13 @@ static inline s32 PatchFlipRequest(u32* cmdbuf, u32 size, u32 vo_handle, u32 buf return ORBIS_OK; } -s32 PS4_SYSV_ABI sceGnmSubmitAndFlipCommandBuffers(u32 count, void* dcb_gpu_addrs[], - u32* dcb_sizes_in_bytes, void* ccb_gpu_addrs[], +s32 PS4_SYSV_ABI sceGnmSubmitAndFlipCommandBuffers(u32 count, u32* dcb_gpu_addrs[], + u32* dcb_sizes_in_bytes, u32* ccb_gpu_addrs[], u32* ccb_sizes_in_bytes, u32 vo_handle, u32 buf_idx, u32 flip_mode, u32 flip_arg) { LOG_INFO(Lib_GnmDriver, "called [buf = {}]", buf_idx); - auto* cmdbuf = reinterpret_cast(dcb_gpu_addrs[count - 1]); + auto* cmdbuf = dcb_gpu_addrs[count - 1]; const auto size_dw = dcb_sizes_in_bytes[count - 1] / 4; const s32 patch_result = @@ -1374,7 +1374,8 @@ s32 PS4_SYSV_ABI sceGnmSubmitAndFlipCommandBuffers(u32 count, void* dcb_gpu_addr return patch_result; } - return sceGnmSubmitCommandBuffers(count, dcb_gpu_addrs, dcb_sizes_in_bytes, ccb_gpu_addrs, + return sceGnmSubmitCommandBuffers(count, const_cast(dcb_gpu_addrs), + dcb_sizes_in_bytes, const_cast(ccb_gpu_addrs), ccb_sizes_in_bytes); } @@ -1383,11 +1384,10 @@ int PS4_SYSV_ABI sceGnmSubmitAndFlipCommandBuffersForWorkload() { return ORBIS_OK; } -s32 PS4_SYSV_ABI sceGnmSubmitCommandBuffers(u32 count, void* dcb_gpu_addrs[], - u32* dcb_sizes_in_bytes, void* ccb_gpu_addrs[], +s32 PS4_SYSV_ABI sceGnmSubmitCommandBuffers(u32 count, const u32* dcb_gpu_addrs[], + u32* dcb_sizes_in_bytes, const u32* ccb_gpu_addrs[], u32* ccb_sizes_in_bytes) { LOG_INFO(Lib_GnmDriver, "called"); - ASSERT_MSG(count == 1, "Multiple command buffer submission is unsupported!"); if (!dcb_gpu_addrs || !dcb_sizes_in_bytes) { LOG_ERROR(Lib_GnmDriver, "dcbGpuAddrs and dcbSizesInBytes must not be NULL"); @@ -1411,7 +1411,12 @@ s32 PS4_SYSV_ABI sceGnmSubmitCommandBuffers(u32 count, void* dcb_gpu_addrs[], } } - liverpool->SubmitGfx(reinterpret_cast(dcb_gpu_addrs[0]), dcb_sizes_in_bytes[0]); + for (auto cbpair = 0u; cbpair < count; ++cbpair) { + const auto* ccb = ccb_gpu_addrs ? ccb_gpu_addrs[cbpair] : nullptr; + const auto ccb_size = ccb_sizes_in_bytes ? ccb_sizes_in_bytes[cbpair] : 0; + + liverpool->SubmitGfx({dcb_gpu_addrs[cbpair], dcb_sizes_in_bytes[cbpair]}, {ccb, ccb_size}); + } return ORBIS_OK; } diff --git a/src/core/libraries/gnmdriver/gnmdriver.h b/src/core/libraries/gnmdriver/gnmdriver.h index c1aeef8e..0f0e454e 100644 --- a/src/core/libraries/gnmdriver/gnmdriver.h +++ b/src/core/libraries/gnmdriver/gnmdriver.h @@ -194,13 +194,13 @@ int PS4_SYSV_ABI sceGnmSqttStopTrace(); int PS4_SYSV_ABI sceGnmSqttSwitchTraceBuffer(); int PS4_SYSV_ABI sceGnmSqttSwitchTraceBuffer2(); int PS4_SYSV_ABI sceGnmSqttWaitForEvent(); -s32 PS4_SYSV_ABI sceGnmSubmitAndFlipCommandBuffers(u32 count, void* dcb_gpu_addrs[], - u32* dcb_sizes_in_bytes, void* ccb_gpu_addrs[], +s32 PS4_SYSV_ABI sceGnmSubmitAndFlipCommandBuffers(u32 count, u32* dcb_gpu_addrs[], + u32* dcb_sizes_in_bytes, u32* ccb_gpu_addrs[], u32* ccb_sizes_in_bytes, u32 vo_handle, u32 buf_idx, u32 flip_mode, u32 flip_arg); int PS4_SYSV_ABI sceGnmSubmitAndFlipCommandBuffersForWorkload(); -s32 PS4_SYSV_ABI sceGnmSubmitCommandBuffers(u32 count, void* dcb_gpu_addrs[], - u32* dcb_sizes_in_bytes, void* ccb_gpu_addrs[], +s32 PS4_SYSV_ABI sceGnmSubmitCommandBuffers(u32 count, const u32* dcb_gpu_addrs[], + u32* dcb_sizes_in_bytes, const u32* ccb_gpu_addrs[], u32* ccb_sizes_in_bytes); int PS4_SYSV_ABI sceGnmSubmitCommandBuffersForWorkload(); int PS4_SYSV_ABI sceGnmSubmitDone(); diff --git a/src/video_core/amdgpu/liverpool.h b/src/video_core/amdgpu/liverpool.h index 2f0d2500..c8e8eb0d 100644 --- a/src/video_core/amdgpu/liverpool.h +++ b/src/video_core/amdgpu/liverpool.h @@ -12,6 +12,7 @@ #include #include #include +#include #include namespace AmdGpu { @@ -618,7 +619,7 @@ public: Liverpool(); ~Liverpool(); - void SubmitGfx(const u32* dcb, u32 dcb_size) { + void SubmitGfx(std::span dcb, std::span ccb) { if (submission_lock) { WaitGpuIdle(); @@ -629,7 +630,9 @@ public: { std::scoped_lock lock{m_ring_access}; - gfx_ring.push({dcb, dcb_size}); + gfx_ring.emplace(dcb); + + ASSERT_MSG(ccb.size() == 0, "CCBs are not supported yet"); } cv_submit.notify_one(); }