diff options
| author | Marek Olšák <[email protected]> | 2017-08-18 18:35:57 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-08-22 13:29:47 +0200 |
| commit | a57f588fa9a376ee7421a612b86c9825a220775f (patch) | |
| tree | 9f5c2a607d4b65e983e64a36de8ad90ad909d6f2 /src/gallium | |
| parent | a65afda768f64e2034e400cff5c0cc8dfef1c353 (diff) | |
radeonsi/gfx9: set 'not a query' for r600_gfx_write_event_eop correctly
0 is PIPE_QUERY_OCCLUSION_COUNTER, which is not what we want.
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_perfcounter.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state_draw.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h index c10cf18219e..813ea067f16 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.h +++ b/src/gallium/drivers/radeon/r600_pipe_common.h @@ -66,6 +66,8 @@ struct u_log_context; /* special primitive types */ #define R600_PRIM_RECTANGLE_LIST PIPE_PRIM_MAX +#define R600_NOT_QUERY 0xffffffff + /* Debug flags. */ /* logging and features */ #define DBG_TEX (1 << 0) diff --git a/src/gallium/drivers/radeonsi/si_perfcounter.c b/src/gallium/drivers/radeonsi/si_perfcounter.c index 50b8d1c6c3d..aa09e0ef6a3 100644 --- a/src/gallium/drivers/radeonsi/si_perfcounter.c +++ b/src/gallium/drivers/radeonsi/si_perfcounter.c @@ -615,7 +615,7 @@ static void si_pc_emit_stop(struct r600_common_context *ctx, struct radeon_winsys_cs *cs = ctx->gfx.cs; r600_gfx_write_event_eop(ctx, EVENT_TYPE_BOTTOM_OF_PIPE_TS, 0, 1, - buffer, va, 0, 0); + buffer, va, 0, R600_NOT_QUERY); r600_gfx_wait_fence(ctx, va, 0, 0xffffffff); radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0)); diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c index f2b889677a5..3bec6396875 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.c +++ b/src/gallium/drivers/radeonsi/si_state_draw.c @@ -899,7 +899,7 @@ void si_emit_cache_flush(struct si_context *sctx) /* Necessary for DCC */ if (rctx->chip_class == VI) r600_gfx_write_event_eop(rctx, V_028A90_FLUSH_AND_INV_CB_DATA_TS, - 0, 0, NULL, 0, 0, 0); + 0, 0, NULL, 0, 0, R600_NOT_QUERY); } if (rctx->flags & SI_CONTEXT_FLUSH_AND_INV_DB) cp_coher_cntl |= S_0085F0_DB_ACTION_ENA(1) | @@ -1000,7 +1000,7 @@ void si_emit_cache_flush(struct si_context *sctx) r600_gfx_write_event_eop(rctx, cb_db_event, tc_flags, 1, sctx->wait_mem_scratch, va, - sctx->wait_mem_number, 0); + sctx->wait_mem_number, R600_NOT_QUERY); r600_gfx_wait_fence(rctx, va, sctx->wait_mem_number, 0xffffffff); } |