diff options
| author | Marek Olšák <[email protected]> | 2019-05-27 16:09:33 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2019-05-29 21:13:35 -0400 |
| commit | 2285b9303282c31a3e599e80acda4b589b4a7966 (patch) | |
| tree | 7651126d128180a4eba6ebe907aa10c10685fc2d | |
| parent | b5697c311b6f29dee40b96c48bad3279e3667c1e (diff) | |
radeonsi: fix timestamp queries for compute-only contexts
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Tested-by: Jan Vesely <[email protected]>
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_fence.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gallium/drivers/radeonsi/si_fence.c b/src/gallium/drivers/radeonsi/si_fence.c index 1d67fd87b90..6d914a1b184 100644 --- a/src/gallium/drivers/radeonsi/si_fence.c +++ b/src/gallium/drivers/radeonsi/si_fence.c @@ -79,8 +79,11 @@ void si_cp_release_mem(struct si_context *ctx, struct radeon_cmdbuf *cs, unsigned sel = EOP_DST_SEL(dst_sel) | EOP_INT_SEL(int_sel) | EOP_DATA_SEL(data_sel); + bool compute_ib = !ctx->has_graphics || + cs == ctx->prim_discard_compute_cs; - if (ctx->chip_class >= GFX9 || cs == ctx->prim_discard_compute_cs) { + if (ctx->chip_class >= GFX9 || + (compute_ib && ctx->chip_class >= GFX7)) { /* A ZPASS_DONE or PIXEL_STAT_DUMP_EVENT (of the DB occlusion * counters) must immediately precede every timestamp event to * prevent a GPU hang on GFX9. @@ -88,8 +91,7 @@ void si_cp_release_mem(struct si_context *ctx, struct radeon_cmdbuf *cs, * Occlusion queries don't need to do it here, because they * always do ZPASS_DONE before the timestamp. */ - if (ctx->chip_class == GFX9 && - cs != ctx->prim_discard_compute_cs && + if (ctx->chip_class == GFX9 && !compute_ib && query_type != PIPE_QUERY_OCCLUSION_COUNTER && query_type != PIPE_QUERY_OCCLUSION_PREDICATE && query_type != PIPE_QUERY_OCCLUSION_PREDICATE_CONSERVATIVE) { |