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

Merge commit 'FETCH_HEAD' into martin/dreams

Browse Source
This commit is contained in:
martin 2024-09-04 03:53:02 -04:00
commit 88240b0e1b
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -304,6 +304,7 @@ struct AscQueueInfo {
VAddr map_addr; VAddr map_addr;
u32* read_addr; u32* read_addr;
u32 ring_size_dw; u32 ring_size_dw;
u32 pipe_id;
}; };
static Common::SlotVector<AscQueueInfo> asc_queues{}; static Common::SlotVector<AscQueueInfo> asc_queues{};
static constexpr VAddr tessellation_factors_ring_addr = Core::SYSTEM_RESERVED_MAX - 0xFFFFFFF; static constexpr VAddr tessellation_factors_ring_addr = Core::SYSTEM_RESERVED_MAX - 0xFFFFFFF;
@ -563,7 +564,7 @@ void PS4_SYSV_ABI sceGnmDingDong(u32 gnm_vqid, u32 next_offs_dw) {
DumpCommandList(acb, fmt::format("acb_{}_{}", gnm_vqid, seq_num)); DumpCommandList(acb, fmt::format("acb_{}_{}", gnm_vqid, seq_num));
} }
liverpool->SubmitAsc(vqid, acb_span); liverpool->SubmitAsc(vqid, acb_span, asc_queue.pipe_id);
*asc_queue.read_addr += acb_size; *asc_queue.read_addr += acb_size;
*asc_queue.read_addr %= asc_queue.ring_size_dw * 4; *asc_queue.read_addr %= asc_queue.ring_size_dw * 4;
@ -1214,7 +1215,7 @@ int PS4_SYSV_ABI sceGnmMapComputeQueue(u32 pipe_id, u32 queue_id, VAddr ring_bas
return ORBIS_GNM_ERROR_COMPUTEQUEUE_INVALID_READ_PTR_ADDR; return ORBIS_GNM_ERROR_COMPUTEQUEUE_INVALID_READ_PTR_ADDR;
} }
auto vqid = asc_queues.insert(VAddr(ring_base_addr), read_ptr_addr, ring_size_dw); auto vqid = asc_queues.insert(VAddr(ring_base_addr), read_ptr_addr, ring_size_dw, pipe_id);
// We need to offset index as `dingDong` assumes it to be from the range [1..64] // We need to offset index as `dingDong` assumes it to be from the range [1..64]
const auto gnm_vqid = vqid.index + 1; const auto gnm_vqid = vqid.index + 1;
LOG_INFO(Lib_GnmDriver, "ASC pipe {} queue {} mapped to vqueue {}", pipe_id, queue_id, LOG_INFO(Lib_GnmDriver, "ASC pipe {} queue {} mapped to vqueue {}", pipe_id, queue_id,

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

@ -545,7 +545,7 @@ Liverpool::Task Liverpool::ProcessGraphics(std::span<const u32> dcb, std::span<c
TracyFiberLeave; TracyFiberLeave;
} }
Liverpool::Task Liverpool::ProcessCompute(std::span<const u32> acb, int vqid) { Liverpool::Task Liverpool::ProcessCompute(std::span<const u32> acb, int vqid, u32 pipeId) {
TracyFiberEnter(acb_task_name); TracyFiberEnter(acb_task_name);
while (!acb.empty()) { while (!acb.empty()) {
@ -567,7 +567,7 @@ Liverpool::Task Liverpool::ProcessCompute(std::span<const u32> acb, int vqid) {
case PM4ItOpcode::IndirectBuffer: { case PM4ItOpcode::IndirectBuffer: {
const auto* indirect_buffer = reinterpret_cast<const PM4CmdIndirectBuffer*>(header); const auto* indirect_buffer = reinterpret_cast<const PM4CmdIndirectBuffer*>(header);
auto task = ProcessCompute( auto task = ProcessCompute(
{indirect_buffer->Address<const u32>(), indirect_buffer->ib_size}, vqid); {indirect_buffer->Address<const u32>(), indirect_buffer->ib_size}, vqid, pipeId);
while (!task.handle.done()) { while (!task.handle.done()) {
task.handle.resume(); task.handle.resume();
@ -625,7 +625,7 @@ Liverpool::Task Liverpool::ProcessCompute(std::span<const u32> acb, int vqid) {
} }
case PM4ItOpcode::ReleaseMem: { case PM4ItOpcode::ReleaseMem: {
const auto* release_mem = reinterpret_cast<const PM4CmdReleaseMem*>(header); const auto* release_mem = reinterpret_cast<const PM4CmdReleaseMem*>(header);
release_mem->SignalFence(Platform::InterruptId::Compute0RelMem); // <--- release_mem->SignalFence((Platform::InterruptId)pipeId); // <---
break; break;
} }
default: default:
@ -687,11 +687,11 @@ void Liverpool::SubmitGfx(std::span<const u32> dcb, std::span<const u32> ccb) {
submit_cv.notify_one(); submit_cv.notify_one();
} }
void Liverpool::SubmitAsc(u32 vqid, std::span<const u32> acb) { void Liverpool::SubmitAsc(u32 vqid, std::span<const u32> acb, u32 pipeId) {
ASSERT_MSG(vqid >= 0 && vqid < NumTotalQueues, "Invalid virtual ASC queue index"); ASSERT_MSG(vqid >= 0 && vqid < NumTotalQueues, "Invalid virtual ASC queue index");
auto& queue = mapped_queues[vqid]; auto& queue = mapped_queues[vqid];
const auto& task = ProcessCompute(acb, vqid); const auto& task = ProcessCompute(acb, vqid, pipeId);
{ {
std::scoped_lock lock{queue.m_access}; std::scoped_lock lock{queue.m_access};
queue.submits.emplace(task.handle); queue.submits.emplace(task.handle);

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

@ -1054,7 +1054,7 @@ public:
~Liverpool(); ~Liverpool();
void SubmitGfx(std::span<const u32> dcb, std::span<const u32> ccb); void SubmitGfx(std::span<const u32> dcb, std::span<const u32> ccb);
void SubmitAsc(u32 vqid, std::span<const u32> acb); void SubmitAsc(u32 vqid, std::span<const u32> acb, u32 pipeId);
void SubmitDone() noexcept { void SubmitDone() noexcept {
std::scoped_lock lk{submit_mutex}; std::scoped_lock lk{submit_mutex};
@ -1125,7 +1125,7 @@ private:
std::span<const u32> ccb); std::span<const u32> ccb);
Task ProcessGraphics(std::span<const u32> dcb, std::span<const u32> ccb); Task ProcessGraphics(std::span<const u32> dcb, std::span<const u32> ccb);
Task ProcessCeUpdate(std::span<const u32> ccb); Task ProcessCeUpdate(std::span<const u32> ccb);
Task ProcessCompute(std::span<const u32> acb, int vqid); Task ProcessCompute(std::span<const u32> acb, int vqid, u32 pipeId);
void Process(std::stop_token stoken); void Process(std::stop_token stoken);