From: Marek Olšák <marek.ol...@amd.com>
---
src/gallium/drivers/radeon/r600_pipe_common.c | 6 ++----
src/gallium/drivers/radeon/r600_pipe_common.h | 4 ----
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 de191e4..8344a55 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 db4eae0..f5837bd 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -518,10 +518,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 1f25f4e..30b45ee 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.
--
2.7.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
