i965: Move flushing out of write_reg and into the callers.

The current callers just want to write a single register, so combining
the register read with a pipeline flush made sense.  However, in the
future we'll want to do multiple register reads back to back, and we'll
only want to flush once.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Kenneth Graunke
2013-05-27 19:44:44 -07:00
parent 63974c0f5b
commit d5db3ece0a

View File

@@ -98,8 +98,10 @@ write_depth_count(struct brw_context *brw, drm_intel_bo *query_bo, int idx)
* Write an arbitrary 64-bit register to a buffer via MI_STORE_REGISTER_MEM.
*
* Only TIMESTAMP and PS_DEPTH_COUNT have special PIPE_CONTROL support; other
* counters have to be read via the generic MI_STORE_REGISTER_MEM. This
* function also performs a pipeline flush for proper synchronization.
* counters have to be read via the generic MI_STORE_REGISTER_MEM.
*
* Callers must explicitly flush the pipeline to ensure the desired value is
* available.
*/
static void
write_reg(struct brw_context *brw,
@@ -107,8 +109,6 @@ write_reg(struct brw_context *brw,
{
assert(brw->gen >= 6);
intel_batchbuffer_emit_mi_flush(brw);
/* MI_STORE_REGISTER_MEM only stores a single 32-bit value, so to
* read a full 64-bit register, we need to do two of them.
*/
@@ -131,6 +131,8 @@ static void
write_primitives_generated(struct brw_context *brw,
drm_intel_bo *query_bo, int idx)
{
intel_batchbuffer_emit_mi_flush(brw);
write_reg(brw, query_bo, CL_INVOCATION_COUNT, idx);
}
@@ -138,6 +140,8 @@ static void
write_xfb_primitives_written(struct brw_context *brw,
drm_intel_bo *query_bo, int idx)
{
intel_batchbuffer_emit_mi_flush(brw);
if (brw->gen >= 7) {
write_reg(brw, query_bo, GEN7_SO_NUM_PRIMS_WRITTEN(0), idx);
} else {