Browse Source

r600g: Don't set the dest cache bits on surface sync for R600_CONTEXT_FLUSH_AND_INV

We are already emitting a EVENT_TYPE_CACHE_FLUSH_AND_INV_EVENT packet
when this flush flag is set, so flushing the dest caches with a
SURFACE_SYNC should not be necessary.

The motivation for this change is that emitting a SURFACE_SYNC packet with
the CB bits set was causing compute shaders to hang on Cayman.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
tags/mesa-9.2-rc1
Tom Stellard 12 years ago
parent
commit
156bcca62c
1 changed files with 13 additions and 15 deletions
  1. 13
    15
      src/gallium/drivers/r600/r600_hw_context.c

+ 13
- 15
src/gallium/drivers/r600/r600_hw_context.c View File

@@ -227,21 +227,19 @@ void r600_flush_emit(struct r600_context *rctx)
cs->buf[cs->cdw++] = PKT3(PKT3_EVENT_WRITE, 0, 0);
cs->buf[cs->cdw++] = EVENT_TYPE(EVENT_TYPE_CACHE_FLUSH_AND_INV_EVENT) | EVENT_INDEX(0);
if (rctx->chip_class >= EVERGREEN) {
cp_coher_cntl = S_0085F0_CB0_DEST_BASE_ENA(1) |
S_0085F0_CB1_DEST_BASE_ENA(1) |
S_0085F0_CB2_DEST_BASE_ENA(1) |
S_0085F0_CB3_DEST_BASE_ENA(1) |
S_0085F0_CB4_DEST_BASE_ENA(1) |
S_0085F0_CB5_DEST_BASE_ENA(1) |
S_0085F0_CB6_DEST_BASE_ENA(1) |
S_0085F0_CB7_DEST_BASE_ENA(1) |
S_0085F0_CB8_DEST_BASE_ENA(1) |
S_0085F0_CB9_DEST_BASE_ENA(1) |
S_0085F0_CB10_DEST_BASE_ENA(1) |
S_0085F0_CB11_DEST_BASE_ENA(1) |
S_0085F0_DB_DEST_BASE_ENA(1) |
S_0085F0_TC_ACTION_ENA(1) |
S_0085F0_CB_ACTION_ENA(1) |
/* We were previously setting the CB and DB bits on
* cp_coher_cntl, but this is unnecessary since
* we are emitting the
* EVENT_TYPE_CACHE_FLUSH_AND_INV_EVENT packet.
* Setting the CB bits was causing lockups when using
* compute on cayman.
*
* XXX: Do even need to emit a surface sync packet here?
* Prior to e5e4c07e7964a3258ed02b530bcdc24c0650204b
* surface sync was not being emitted with the
* R600_CONTEXT_FLUSH_AND_INV flag.
*/
cp_coher_cntl = S_0085F0_TC_ACTION_ENA(1) |
S_0085F0_DB_ACTION_ENA(1) |
S_0085F0_SH_ACTION_ENA(1) |
S_0085F0_SMX_ACTION_ENA(1) |

Loading…
Cancel
Save