Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7704befb authored by Thomas Hellstrom's avatar Thomas Hellstrom Committed by Dave Airlie
Browse files

drm/vmwgfx: Make fence sequences continous across a VT switch. 



A vt switch in stealth mode would take down the FIFO, and re-
initialize fence sequence numbers. This patch
saves the current state of the fence sequence when the FIFO is
disabled.

Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 50ec3b7c

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) 


	dev_priv->dev = dev;

	dev_priv->vmw_chipset = chipset;

	dev_priv->last_read_sequence = (uint32_t) -100;

	mutex_init(&dev_priv->hw_mutex);

	mutex_init(&dev_priv->cmdbuf_mutex);

	rwlock_init(&dev_priv->resource_lock);

drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c

+1 −2
Original line number Diff line number Diff line
@@ -98,8 +98,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo) 
		 (unsigned int) min,

		 (unsigned int) fifo->capabilities);



	dev_priv->fence_seq = (uint32_t) -100;

	dev_priv->last_read_sequence = (uint32_t) -100;

	dev_priv->fence_seq = dev_priv->last_read_sequence;

	iowrite32(dev_priv->last_read_sequence, fifo_mem + SVGA_FIFO_FENCE);



	return vmw_fifo_send_fence(dev_priv, &dummy);