From f2869790d9ea4425b28a9ff80a68f772e70a356c Mon Sep 17 00:00:00 2001 From: Matt Borgerson Date: Wed, 17 Jun 2020 00:51:10 -0700 Subject: [PATCH] nv2a: Check for PGRAPH FIFO access before context switch --- hw/xbox/nv2a/nv2a_pfifo.c | 19 ++++++++----------- hw/xbox/nv2a/nv2a_pgraph.c | 7 +------ 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/hw/xbox/nv2a/nv2a_pfifo.c b/hw/xbox/nv2a/nv2a_pfifo.c index 14e155c4b3..849b5e9649 100644 --- a/hw/xbox/nv2a/nv2a_pfifo.c +++ b/hw/xbox/nv2a/nv2a_pfifo.c @@ -173,6 +173,13 @@ static void pfifo_run_puller(NV2AState *d) qemu_mutex_lock(&d->pgraph.lock); //make pgraph busy + if (!pgraph_can_fifo_access(d)) { + qemu_mutex_unlock(&d->pgraph.lock); + qemu_mutex_lock(&d->pfifo.lock); + // Wait for event + return; + } + // Switch contexts if necessary pgraph_context_switch(d, entry.channel_id); if (d->pgraph.waiting_for_context_switch) { @@ -181,15 +188,6 @@ static void pfifo_run_puller(NV2AState *d) // Wait for event return; } - - pgraph_wait_fifo_access(d); - if (!pgraph_is_wait_for_access_complete(d)) { - qemu_mutex_unlock(&d->pgraph.lock); - qemu_mutex_lock(&d->pfifo.lock); - // Wait for event - return; - } - d->pgraph.waiting_for_fifo_access = false; pgraph_method(d, subchannel, 0, entry.instance); // make pgraph not busy @@ -220,8 +218,7 @@ static void pfifo_run_puller(NV2AState *d) qemu_mutex_lock(&d->pgraph.lock); //make pgraph busy - pgraph_wait_fifo_access(d); - if (!pgraph_is_wait_for_access_complete(d)) { + if (!pgraph_can_fifo_access(d)) { qemu_mutex_unlock(&d->pgraph.lock); qemu_mutex_lock(&d->pfifo.lock); // Wait for event diff --git a/hw/xbox/nv2a/nv2a_pgraph.c b/hw/xbox/nv2a/nv2a_pgraph.c index 4045f33114..55265c1735 100644 --- a/hw/xbox/nv2a/nv2a_pgraph.c +++ b/hw/xbox/nv2a/nv2a_pgraph.c @@ -2617,12 +2617,7 @@ static void pgraph_context_switch(NV2AState *d, unsigned int channel_id) } } -static void pgraph_wait_fifo_access(NV2AState *d) -{ - d->pgraph.waiting_for_fifo_access = true; -} - -static int pgraph_is_wait_for_access_complete(NV2AState *d) { +static int pgraph_can_fifo_access(NV2AState *d) { return !!(d->pgraph.regs[NV_PGRAPH_FIFO] & NV_PGRAPH_FIFO_ACCESS); }