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

radeonsi: move gfx fence wait out of si_check_vm_faults

Browse source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Nicolai Hähnle 2016-06-20 16:47:06 +02:00
parent ad8438403b
commit 80dd7870fe
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/drivers/radeonsi/si_debug.c
View file

@ -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;

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

@ -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;