vmwgfx: Add fence events

Add a way to send DRM events down the gpu fifo by attaching them to
fence objects. This may be useful for Xserver swapbuffer throttling and
page-flip done notifications.

Bump version to 2.2 to signal the availability of the FENCE_EVENT ioctl.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
index 62d6377b8ee8..03bbc2a6f9a7 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
@@ -247,9 +247,8 @@ static int vmw_fifo_wait(struct vmw_private *dev_priv,
                 spin_lock_irqsave(&dev_priv->irq_lock, irq_flags);
                 outl(SVGA_IRQFLAG_FIFO_PROGRESS,
                      dev_priv->io_start + VMWGFX_IRQSTATUS_PORT);
-                vmw_write(dev_priv, SVGA_REG_IRQMASK,
-                          vmw_read(dev_priv, SVGA_REG_IRQMASK) |
-                          SVGA_IRQFLAG_FIFO_PROGRESS);
+                dev_priv->irq_mask |= SVGA_IRQFLAG_FIFO_PROGRESS;
+                vmw_write(dev_priv, SVGA_REG_IRQMASK, dev_priv->irq_mask);
                 spin_unlock_irqrestore(&dev_priv->irq_lock, irq_flags);
         }
         mutex_unlock(&dev_priv->hw_mutex);
@@ -271,9 +270,8 @@ static int vmw_fifo_wait(struct vmw_private *dev_priv,
         mutex_lock(&dev_priv->hw_mutex);
         if (atomic_dec_and_test(&dev_priv->fifo_queue_waiters)) {
                 spin_lock_irqsave(&dev_priv->irq_lock, irq_flags);
-                vmw_write(dev_priv, SVGA_REG_IRQMASK,
-                          vmw_read(dev_priv, SVGA_REG_IRQMASK) &
-                          ~SVGA_IRQFLAG_FIFO_PROGRESS);
+                dev_priv->irq_mask &= ~SVGA_IRQFLAG_FIFO_PROGRESS;
+                vmw_write(dev_priv, SVGA_REG_IRQMASK, dev_priv->irq_mask);
                 spin_unlock_irqrestore(&dev_priv->irq_lock, irq_flags);
         }
         mutex_unlock(&dev_priv->hw_mutex);