diff options
| author | Marek Olšák <[email protected]> | 2018-04-01 13:29:04 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2018-04-05 15:34:58 -0400 |
| commit | 5c125ab1ba030174e59e4e31f27a267571f224e1 (patch) | |
| tree | f81633056d980828c28880f6e2d2fffa05e4cf21 /src | |
| parent | 17e8f1608ec78568e2815f07661ff93646ad1b16 (diff) | |
radeonsi: remove r600_pipe_common::check_vm_faults
Acked-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.c | 6 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.h | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_debug.c | 1 |
3 files changed, 2 insertions, 9 deletions
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c index de191e4ade5..8344a557f05 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.c +++ b/src/gallium/drivers/radeon/r600_pipe_common.c @@ -239,9 +239,7 @@ void si_flush_dma_cs(void *ctx, unsigned flags, struct pipe_fence_handle **fence struct r600_common_context *rctx = (struct r600_common_context *)ctx; struct radeon_winsys_cs *cs = rctx->dma.cs; struct radeon_saved_cs saved; - bool check_vm = - (rctx->screen->debug_flags & DBG(CHECK_VM)) && - rctx->check_vm_faults; + bool check_vm = (rctx->screen->debug_flags & DBG(CHECK_VM)); if (!radeon_emitted(cs, 0)) { if (fence) @@ -262,7 +260,7 @@ void si_flush_dma_cs(void *ctx, unsigned flags, struct pipe_fence_handle **fence */ rctx->ws->fence_wait(rctx->ws, rctx->last_sdma_fence, 800*1000*1000); - rctx->check_vm_faults(rctx, &saved, RING_DMA); + si_check_vm_faults(rctx, &saved, RING_DMA); si_clear_saved_cs(&saved); } } diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h index 1608f76e3a5..96e68c574cb 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.h +++ b/src/gallium/drivers/radeon/r600_pipe_common.h @@ -519,10 +519,6 @@ struct r600_common_context { void (*set_atom_dirty)(struct r600_common_context *ctx, struct r600_atom *atom, bool dirty); - - void (*check_vm_faults)(struct r600_common_context *ctx, - struct radeon_saved_cs *saved, - enum ring_type ring); }; /* r600_buffer_common.c */ diff --git a/src/gallium/drivers/radeonsi/si_debug.c b/src/gallium/drivers/radeonsi/si_debug.c index 1f25f4ebbeb..30b45eeac7b 100644 --- a/src/gallium/drivers/radeonsi/si_debug.c +++ b/src/gallium/drivers/radeonsi/si_debug.c @@ -1109,7 +1109,6 @@ void si_check_vm_faults(struct r600_common_context *ctx, void si_init_debug_functions(struct si_context *sctx) { sctx->b.b.dump_debug_state = si_dump_debug_state; - sctx->b.check_vm_faults = si_check_vm_faults; /* Set the initial dmesg timestamp for this context, so that * only new messages will be checked for VM faults. |