aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorNicolai Hähnle <[email protected]>2016-06-20 16:47:06 +0200
committerNicolai Hähnle <[email protected]>2016-06-24 12:36:03 +0200
commit80dd7870fe87969e97045ea71b1f6e8180ac9606 (patch)
tree3c1c3d48fa849b4add1422dd7066267531c465d0 /src/gallium
parentad8438403b32088260ec845fc2e7304586328913 (diff)
radeonsi: move gfx fence wait out of si_check_vm_faults
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/radeonsi/si_debug.c5
-rw-r--r--src/gallium/drivers/radeonsi/si_hw_context.c8
2 files changed, 7 insertions, 6 deletions
diff --git a/src/gallium/drivers/radeonsi/si_debug.c b/src/gallium/drivers/radeonsi/si_debug.c
index 176a195e740..8e16e2906a4 100644
--- a/src/gallium/drivers/radeonsi/si_debug.c
+++ b/src/gallium/drivers/radeonsi/si_debug.c
@@ -774,11 +774,6 @@ void si_check_vm_faults(struct si_context *sctx)
FILE *f;
uint32_t addr;
- /* Use conservative timeout 800ms, after which we won't wait any
- * longer and assume the GPU is hung.
- */
- sctx->b.ws->fence_wait(sctx->b.ws, sctx->last_gfx_fence, 800*1000*1000);
-
if (!si_vm_fault_occured(sctx, &addr))
return;
diff --git a/src/gallium/drivers/radeonsi/si_hw_context.c b/src/gallium/drivers/radeonsi/si_hw_context.c
index 696217d0bb5..656d435361c 100644
--- a/src/gallium/drivers/radeonsi/si_hw_context.c
+++ b/src/gallium/drivers/radeonsi/si_hw_context.c
@@ -144,8 +144,14 @@ void si_context_gfx_flush(void *context, unsigned flags,
ws->fence_reference(fence, ctx->last_gfx_fence);
/* Check VM faults if needed. */
- if (ctx->screen->b.debug_flags & DBG_CHECK_VM)
+ if (ctx->screen->b.debug_flags & DBG_CHECK_VM) {
+ /* Use conservative timeout 800ms, after which we won't wait any
+ * longer and assume the GPU is hung.
+ */
+ ctx->b.ws->fence_wait(ctx->b.ws, ctx->last_gfx_fence, 800*1000*1000);
+
si_check_vm_faults(ctx);
+ }
si_begin_new_cs(ctx);
ctx->gfx_flush_in_progress = false;