Commit 359dc60d authored by Zack Rusin's avatar Zack Rusin
Browse files

drm/vmwgfx: Remove the throttling code 



Throttling was used before fencing to implement early vsync
support in the xorg state tracker a long time ago. The xorg
state tracker has been removed years ago and no one else
has ever used throttling. It's time to remove this code,
it hasn't been used or tested in years.

Signed-off-by: default avatarZack Rusin <zackr@vmware.com>
Reviewed-by: default avatarMartin Krastev <krastevm@vmware.com>
Reviewed-by: default avatarRoland Scheidegger <sroland@vmware.com>
Link: https://patchwork.freedesktop.org/patch/414042/?series=85516&rev=2
parent 8772c0bb

drivers/gpu/drm/vmwgfx/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_kms.o vmwgfx_drv.o \

	    vmwgfx_fb.o vmwgfx_ioctl.o vmwgfx_resource.o vmwgfx_ttm_buffer.o \

	    vmwgfx_fifo.o vmwgfx_irq.o vmwgfx_ldu.o vmwgfx_ttm_glue.o \

	    vmwgfx_overlay.o vmwgfx_marker.o vmwgfx_gmrid_manager.o \

	    vmwgfx_fence.o vmwgfx_bo.o vmwgfx_scrn.o vmwgfx_context.o \

	    vmwgfx_overlay.o vmwgfx_gmrid_manager.o vmwgfx_fence.o \

	    vmwgfx_bo.o vmwgfx_scrn.o vmwgfx_context.o \

	    vmwgfx_surface.o vmwgfx_prime.o vmwgfx_mob.o vmwgfx_shader.o \

	    vmwgfx_cmdbuf_res.o vmwgfx_cmdbuf.o vmwgfx_stdu.o \

	    vmwgfx_cotable.o vmwgfx_so.o vmwgfx_binding.o vmwgfx_msg.o \

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+0 −21
Original line number Diff line number Diff line
@@ -276,13 +276,6 @@ struct vmw_surface { 
	struct list_head view_list;

};



struct vmw_marker_queue {

	struct list_head head;

	u64 lag;

	u64 lag_time;

	spinlock_t lock;

};



struct vmw_fifo_state {

	unsigned long reserved_size;

	u32 *dynamic_buffer;
@@ -292,7 +285,6 @@ struct vmw_fifo_state { 
	uint32_t capabilities;

	struct mutex fifo_mutex;

	struct rw_semaphore rwsem;

	struct vmw_marker_queue marker_queue;

	bool dx;

};
@@ -1120,19 +1112,6 @@ extern void vmw_generic_waiter_add(struct vmw_private *dev_priv, u32 flag, 
extern void vmw_generic_waiter_remove(struct vmw_private *dev_priv,

				      u32 flag, int *waiter_count);



/**

 * Rudimentary fence-like objects currently used only for throttling -

 * vmwgfx_marker.c

 */



extern void vmw_marker_queue_init(struct vmw_marker_queue *queue);

extern void vmw_marker_queue_takedown(struct vmw_marker_queue *queue);

extern int vmw_marker_push(struct vmw_marker_queue *queue,

			   uint32_t seqno);

extern int vmw_marker_pull(struct vmw_marker_queue *queue,

			   uint32_t signaled_seqno);

extern int vmw_wait_lag(struct vmw_private *dev_priv,

			struct vmw_marker_queue *queue, uint32_t us);



/**

 * Kernel framebuffer - vmwgfx_fb.c

drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c

+1 −5
Original line number Diff line number Diff line
@@ -4046,11 +4046,7 @@ int vmw_execbuf_process(struct drm_file *file_priv, 
	}



	if (throttle_us) {

		ret = vmw_wait_lag(dev_priv, &dev_priv->fifo.marker_queue,

				   throttle_us);



		if (ret)

			goto out_free_fence_fd;

		VMW_DEBUG_USER("Throttling is no longer supported.\n");

	}



	kernel_commands = vmw_execbuf_cmdbuf(dev_priv, user_commands,

drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c

+0 −4
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo) 


	atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);

	vmw_fifo_mem_write(dev_priv, SVGA_FIFO_FENCE, dev_priv->last_read_seqno);

	vmw_marker_queue_init(&fifo->marker_queue);



	return 0;

}
@@ -185,8 +184,6 @@ void vmw_fifo_release(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo) 
	vmw_write(dev_priv, SVGA_REG_TRACES,

		  dev_priv->traces_state);



	vmw_marker_queue_takedown(&fifo->marker_queue);



	if (likely(fifo->static_buffer != NULL)) {

		vfree(fifo->static_buffer);

		fifo->static_buffer = NULL;
@@ -563,7 +560,6 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno) 
	cmd_fence = (struct svga_fifo_cmd_fence *) fm;

	cmd_fence->fence = *seqno;

	vmw_fifo_commit_flush(dev_priv, bytes);

	(void) vmw_marker_push(&fifo_state->marker_queue, *seqno);

	vmw_update_seqno(dev_priv, fifo_state);



out_err:

drivers/gpu/drm/vmwgfx/vmwgfx_irq.c

+0 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ void vmw_update_seqno(struct vmw_private *dev_priv, 


	if (dev_priv->last_read_seqno != seqno) {

		dev_priv->last_read_seqno = seqno;

		vmw_marker_pull(&fifo_state->marker_queue, seqno);

		vmw_fences_update(dev_priv->fman);

	}

}