radeonsi/compute: Let the state tracker do all the flushing
authorTom Stellard <thomas.stellard@amd.com>
Fri, 16 Aug 2013 21:38:40 +0000 (17:38 -0400)
committerMarek Olšák <marek.olsak@amd.com>
Fri, 16 Aug 2013 23:48:25 +0000 (01:48 +0200)
It shouldn't be necessary to call radeon_winsys::cs_flush() from
radeonsi_launch_grid(), because the state tracker is responsible for
flushing the pipeline at the appropriate time.  The current behavior is
also wrong, because radeonsi_launch_grid() submits packets to the
compute ring, but when the state tracker calls pipe->flush() everything
is submitted to the graphics ring.  This has the potential to create a
race condition.

The downside of removing this flush is that the compute dispatch packets
will be sent to the graphics ring rather than the compute ring.
In the future we will need to come up with a way to detect 'compute'
command streams and submit them to the appropriate ring.

Signed-off-by: Marek Olšák <marek.olsak@amd.com>
src/gallium/drivers/radeonsi/radeonsi_compute.c

index 41c72c52ffb6c043c14aba19fac4ae245d48eb49..10309bad0e13f6c3d91c784f968caaa1cb8f1cba 100644 (file)
@@ -230,9 +230,6 @@ static void radeonsi_launch_grid(
        }
 #endif
 
-       rctx->ws->cs_flush(rctx->cs, RADEON_FLUSH_COMPUTE, 0);
-       rctx->ws->buffer_wait(shader->bo->buf, 0);
-
        FREE(pm4);
        FREE(kernel_args);
 }