fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 04:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi: fix timestamp queries for compute-only contexts

Browse source 
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Tested-by: Jan Vesely <jan.vesely@rutgers.edu>
This commit is contained in:
Marek Olšák 2019-05-27 16:09:33 -04:00
parent b5697c311b
commit 2285b93032
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gallium/drivers/radeonsi/si_fence.c
View file

@ -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) {