radeonsi: remove r600_pipe_common::check_vm_faults

Acked-by: Timothy Arceri <tarceri@itsqueeze.com>

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
index de191e4ade5fe4a5afec51a6917185f7797f58b5..8344a557f058ee8fd5790cb3d1a63723c57f0051 100644 (file)
--- 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 1608f76e3a5dfc4afa3d9198eb8d80ac2b26628c..96e68c574cba8a4535f3951612c0139a0a06aa3c 100644 (file)
--- 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 1f25f4ebbebc85f87f346178465f52b18f837ec6..30b45eeac7b19a3032983d07cc27b7aeee272f28 100644 (file)
--- 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.