5 files changed, 1 insertions, 36 deletions
diff --git a/src/gallium/targets/dri-vmwgfx/target.c b/src/gallium/targets/dri-vmwgfx/target.c
index 442e31bba95..e01e4652ada 100644
--- a/src/gallium/targets/dri-vmwgfx/target.c
+++ b/src/gallium/targets/dri-vmwgfx/target.c
@@ -19,7 +19,6 @@ create_screen(int fd)
    if (!screen)
       return NULL;
 
-   vmw_winsys_screen_set_throttling(screen, 0);
    screen = sw_screen_wrap(screen);
 
    screen = debug_screen_wrap(screen);
diff --git a/src/gallium/winsys/svga/drm/vmw_context.c b/src/gallium/winsys/svga/drm/vmw_context.c
index 2edb5eae102..e08a48ccc3b 100644
--- a/src/gallium/winsys/svga/drm/vmw_context.c
+++ b/src/gallium/winsys/svga/drm/vmw_context.c
@@ -101,9 +101,6 @@ struct vmw_svga_winsys_context
     * referred.
     */
    boolean preemptive_flush;
-
-   boolean throttle_set;
-   uint32_t throttle_us;
 };
 
 
@@ -136,7 +133,6 @@ vmw_swc_flush(struct svga_winsys_context *swc,
    struct pipe_fence_handle *fence = NULL;
    unsigned i;
    enum pipe_error ret;
-   uint32_t throttle_us;
 
    ret = pb_validate_validate(vswc->validate);
    assert(ret == PIPE_OK);
@@ -155,13 +151,10 @@ vmw_swc_flush(struct svga_winsys_context *swc,
          *reloc->where = ptr;
       }
 
-      throttle_us = vswc->throttle_set ?
-	 vswc->throttle_us : vswc->vws->default_throttle_us;
-
       if (vswc->command.used || pfence != NULL)
          vmw_ioctl_command(vswc->vws,
 			   vswc->base.cid,
-			   throttle_us,
+			   0,
                            vswc->command.buffer,
                            vswc->command.used,
                            &fence);
@@ -401,15 +394,3 @@ vmw_svga_winsys_context_create(struct svga_winsys_screen *sws)
 
    return &vswc->base;
 }
-
-
-void
-vmw_svga_context_set_throttling(struct pipe_context *pipe,
-				uint32_t throttle_us)
-{
-   struct svga_winsys_context *swc = svga_winsys_context(pipe);
-   struct vmw_svga_winsys_context *vswc = vmw_svga_winsys_context(swc);
-
-   vswc->throttle_us = throttle_us;
-   vswc->throttle_set = TRUE;
-}
diff --git a/src/gallium/winsys/svga/drm/vmw_context.h b/src/gallium/winsys/svga/drm/vmw_context.h
index aed8b93734b..b27e0b8f4be 100644
--- a/src/gallium/winsys/svga/drm/vmw_context.h
+++ b/src/gallium/winsys/svga/drm/vmw_context.h
@@ -52,8 +52,4 @@ struct pipe_screen;
 struct svga_winsys_context *
 vmw_svga_winsys_context_create(struct svga_winsys_screen *sws);
 
-void
-vmw_svga_context_set_throttling(struct pipe_context *pipe,
-				uint32_t throttle_us);
-
 #endif /* VMW_CONTEXT_H_ */
diff --git a/src/gallium/winsys/svga/drm/vmw_screen.c b/src/gallium/winsys/svga/drm/vmw_screen.c
index cc3003d252f..f7799cec32d 100644
--- a/src/gallium/winsys/svga/drm/vmw_screen.c
+++ b/src/gallium/winsys/svga/drm/vmw_screen.c
@@ -73,13 +73,3 @@ vmw_winsys_destroy(struct vmw_winsys_screen *vws)
    vmw_ioctl_cleanup(vws);
    FREE(vws);
 }
-
-void
-vmw_winsys_screen_set_throttling(struct pipe_screen *screen,
-				 uint32_t throttle_us)
-{
-   struct vmw_winsys_screen  *vws =
-      vmw_winsys_screen(svga_winsys_screen(screen));
-
-   vws->default_throttle_us = throttle_us;
-}
diff --git a/src/gallium/winsys/svga/drm/vmw_screen.h b/src/gallium/winsys/svga/drm/vmw_screen.h
index 1ddebf208ce..bdc1c7ba3de 100644
--- a/src/gallium/winsys/svga/drm/vmw_screen.h
+++ b/src/gallium/winsys/svga/drm/vmw_screen.h
@@ -59,7 +59,6 @@ struct vmw_winsys_screen
    struct svga_winsys_screen base;
 
    boolean use_old_scanout_flag;
-   uint32_t default_throttle_us;
 
    struct {
       int drm_fd;