1 files changed, 107 insertions, 80 deletions

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
index e92298a6a383..cabc95f7517e 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
@@ -34,26 +34,33 @@ irqreturn_t vmw_irq_handler(DRM_IRQ_ARGS)
 {
         struct drm_device *dev = (struct drm_device *)arg;
         struct vmw_private *dev_priv = vmw_priv(dev);
-        uint32_t status;
+        uint32_t status, masked_status;
 
         spin_lock(&dev_priv->irq_lock);
         status = inl(dev_priv->io_start + VMWGFX_IRQSTATUS_PORT);
+        masked_status = status & dev_priv->irq_mask;
         spin_unlock(&dev_priv->irq_lock);
 
-        if (status & SVGA_IRQFLAG_ANY_FENCE)
+        if (likely(status))
+                outl(status, dev_priv->io_start + VMWGFX_IRQSTATUS_PORT);
+
+        if (!masked_status)
+                return IRQ_NONE;
+
+        if (masked_status & (SVGA_IRQFLAG_ANY_FENCE |
+                             SVGA_IRQFLAG_FENCE_GOAL)) {
+                vmw_fences_update(dev_priv->fman);
                 wake_up_all(&dev_priv->fence_queue);
-        if (status & SVGA_IRQFLAG_FIFO_PROGRESS)
+        }
+
+        if (masked_status & SVGA_IRQFLAG_FIFO_PROGRESS)
                 wake_up_all(&dev_priv->fifo_queue);
 
-        if (likely(status)) {
-                outl(status, dev_priv->io_start + VMWGFX_IRQSTATUS_PORT);
-                return IRQ_HANDLED;
-        }
 
-        return IRQ_NONE;
+        return IRQ_HANDLED;
 }
 
-static bool vmw_fifo_idle(struct vmw_private *dev_priv, uint32_t sequence)
+static bool vmw_fifo_idle(struct vmw_private *dev_priv, uint32_t seqno)
 {
         uint32_t busy;
 
@@ -64,43 +71,43 @@ static bool vmw_fifo_idle(struct vmw_private *dev_priv, uint32_t sequence)
         return (busy == 0);
 }
 
-void vmw_update_sequence(struct vmw_private *dev_priv,
+void vmw_update_seqno(struct vmw_private *dev_priv,
                          struct vmw_fifo_state *fifo_state)
 {
         __le32 __iomem *fifo_mem = dev_priv->mmio_virt;
+        uint32_t seqno = ioread32(fifo_mem + SVGA_FIFO_FENCE);
 
-        uint32_t sequence = ioread32(fifo_mem + SVGA_FIFO_FENCE);
-
-        if (dev_priv->last_read_sequence != sequence) {
-                dev_priv->last_read_sequence = sequence;
-                vmw_fence_pull(&fifo_state->fence_queue, sequence);
+        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);
         }
 }
 
-bool vmw_fence_signaled(struct vmw_private *dev_priv,
-                        uint32_t sequence)
+bool vmw_seqno_passed(struct vmw_private *dev_priv,
+                         uint32_t seqno)
 {
         struct vmw_fifo_state *fifo_state;
         bool ret;
 
-        if (likely(dev_priv->last_read_sequence - sequence < VMW_FENCE_WRAP))
+        if (likely(dev_priv->last_read_seqno - seqno < VMW_FENCE_WRAP))
                 return true;
 
         fifo_state = &dev_priv->fifo;
-        vmw_update_sequence(dev_priv, fifo_state);
-        if (likely(dev_priv->last_read_sequence - sequence < VMW_FENCE_WRAP))
+        vmw_update_seqno(dev_priv, fifo_state);
+        if (likely(dev_priv->last_read_seqno - seqno < VMW_FENCE_WRAP))
                 return true;
 
         if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE) &&
-            vmw_fifo_idle(dev_priv, sequence))
+            vmw_fifo_idle(dev_priv, seqno))
                 return true;
 
         /**
-         * Then check if the sequence is higher than what we've actually
+         * Then check if the seqno is higher than what we've actually
          * emitted. Then the fence is stale and signaled.
          */
 
-        ret = ((atomic_read(&dev_priv->fence_seq) - sequence)
+        ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
                > VMW_FENCE_WRAP);
 
         return ret;
@@ -109,7 +116,7 @@ bool vmw_fence_signaled(struct vmw_private *dev_priv,
 int vmw_fallback_wait(struct vmw_private *dev_priv,
                       bool lazy,
                       bool fifo_idle,
-                      uint32_t sequence,
+                      uint32_t seqno,
                       bool interruptible,
                       unsigned long timeout)
 {
@@ -123,7 +130,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
         DEFINE_WAIT(__wait);
 
         wait_condition = (fifo_idle) ? &vmw_fifo_idle :
-                &vmw_fence_signaled;
+                &vmw_seqno_passed;
 
         /**
          * Block command submission while waiting for idle.
@@ -131,14 +138,14 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
 
         if (fifo_idle)
                 down_read(&fifo_state->rwsem);
-        signal_seq = atomic_read(&dev_priv->fence_seq);
+        signal_seq = atomic_read(&dev_priv->marker_seq);
         ret = 0;
 
         for (;;) {
                 prepare_to_wait(&dev_priv->fence_queue, &__wait,
                                 (interruptible) ?
                                 TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
-                if (wait_condition(dev_priv, sequence))
+                if (wait_condition(dev_priv, seqno))
                         break;
                 if (time_after_eq(jiffies, end_jiffies)) {
                         DRM_ERROR("SVGA device lockup.\n");
@@ -175,68 +182,110 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
         return ret;
 }
 
-int vmw_wait_fence(struct vmw_private *dev_priv,
-                   bool lazy, uint32_t sequence,
-                   bool interruptible, unsigned long timeout)
+void vmw_seqno_waiter_add(struct vmw_private *dev_priv)
+{
+        mutex_lock(&dev_priv->hw_mutex);
+        if (dev_priv->fence_queue_waiters++ == 0) {
+                unsigned long irq_flags;
+
+                spin_lock_irqsave(&dev_priv->irq_lock, irq_flags);
+                outl(SVGA_IRQFLAG_ANY_FENCE,
+                     dev_priv->io_start + VMWGFX_IRQSTATUS_PORT);
+                dev_priv->irq_mask |= SVGA_IRQFLAG_ANY_FENCE;
+                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);
+}
+
+void vmw_seqno_waiter_remove(struct vmw_private *dev_priv)
+{
+        mutex_lock(&dev_priv->hw_mutex);
+        if (--dev_priv->fence_queue_waiters == 0) {
+                unsigned long irq_flags;
+
+                spin_lock_irqsave(&dev_priv->irq_lock, irq_flags);
+                dev_priv->irq_mask &= ~SVGA_IRQFLAG_ANY_FENCE;
+                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);
+}
+
+
+void vmw_goal_waiter_add(struct vmw_private *dev_priv)
+{
+        mutex_lock(&dev_priv->hw_mutex);
+        if (dev_priv->goal_queue_waiters++ == 0) {
+                unsigned long irq_flags;
+
+                spin_lock_irqsave(&dev_priv->irq_lock, irq_flags);
+                outl(SVGA_IRQFLAG_FENCE_GOAL,
+                     dev_priv->io_start + VMWGFX_IRQSTATUS_PORT);
+                dev_priv->irq_mask |= SVGA_IRQFLAG_FENCE_GOAL;
+                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);
+}
+
+void vmw_goal_waiter_remove(struct vmw_private *dev_priv)
+{
+        mutex_lock(&dev_priv->hw_mutex);
+        if (--dev_priv->goal_queue_waiters == 0) {
+                unsigned long irq_flags;
+
+                spin_lock_irqsave(&dev_priv->irq_lock, irq_flags);
+                dev_priv->irq_mask &= ~SVGA_IRQFLAG_FENCE_GOAL;
+                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);
+}
+
+int vmw_wait_seqno(struct vmw_private *dev_priv,
+                      bool lazy, uint32_t seqno,
+                      bool interruptible, unsigned long timeout)
 {
         long ret;
-        unsigned long irq_flags;
         struct vmw_fifo_state *fifo = &dev_priv->fifo;
 
-        if (likely(dev_priv->last_read_sequence - sequence < VMW_FENCE_WRAP))
+        if (likely(dev_priv->last_read_seqno - seqno < VMW_FENCE_WRAP))
                 return 0;
 
-        if (likely(vmw_fence_signaled(dev_priv, sequence)))
+        if (likely(vmw_seqno_passed(dev_priv, seqno)))
                 return 0;
 
         vmw_fifo_ping_host(dev_priv, SVGA_SYNC_GENERIC);
 
         if (!(fifo->capabilities & SVGA_FIFO_CAP_FENCE))
-                return vmw_fallback_wait(dev_priv, lazy, true, sequence,
+                return vmw_fallback_wait(dev_priv, lazy, true, seqno,
                                          interruptible, timeout);
 
         if (!(dev_priv->capabilities & SVGA_CAP_IRQMASK))
-                return vmw_fallback_wait(dev_priv, lazy, false, sequence,
+                return vmw_fallback_wait(dev_priv, lazy, false, seqno,
                                          interruptible, timeout);
 
-        mutex_lock(&dev_priv->hw_mutex);
-        if (atomic_add_return(1, &dev_priv->fence_queue_waiters) > 0) {
-                spin_lock_irqsave(&dev_priv->irq_lock, irq_flags);
-                outl(SVGA_IRQFLAG_ANY_FENCE,
-                     dev_priv->io_start + VMWGFX_IRQSTATUS_PORT);
-                vmw_write(dev_priv, SVGA_REG_IRQMASK,
-                          vmw_read(dev_priv, SVGA_REG_IRQMASK) |
-                          SVGA_IRQFLAG_ANY_FENCE);
-                spin_unlock_irqrestore(&dev_priv->irq_lock, irq_flags);
-        }
-        mutex_unlock(&dev_priv->hw_mutex);
+        vmw_seqno_waiter_add(dev_priv);
 
         if (interruptible)
                 ret = wait_event_interruptible_timeout
                     (dev_priv->fence_queue,
-                     vmw_fence_signaled(dev_priv, sequence),
+                     vmw_seqno_passed(dev_priv, seqno),
                      timeout);
         else
                 ret = wait_event_timeout
                     (dev_priv->fence_queue,
-                     vmw_fence_signaled(dev_priv, sequence),
+                     vmw_seqno_passed(dev_priv, seqno),
                      timeout);
 
+        vmw_seqno_waiter_remove(dev_priv);
+
         if (unlikely(ret == 0))
                 ret = -EBUSY;
         else if (likely(ret > 0))
                 ret = 0;
 
-        mutex_lock(&dev_priv->hw_mutex);
-        if (atomic_dec_and_test(&dev_priv->fence_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_ANY_FENCE);
-                spin_unlock_irqrestore(&dev_priv->irq_lock, irq_flags);
-        }
-        mutex_unlock(&dev_priv->hw_mutex);
-
         return ret;
 }
 
@@ -273,25 +322,3 @@ void vmw_irq_uninstall(struct drm_device *dev)
         status = inl(dev_priv->io_start + VMWGFX_IRQSTATUS_PORT);
         outl(status, dev_priv->io_start + VMWGFX_IRQSTATUS_PORT);
 }
-
-#define VMW_FENCE_WAIT_TIMEOUT 3*HZ;
-
-int vmw_fence_wait_ioctl(struct drm_device *dev, void *data,
-                         struct drm_file *file_priv)
-{
-        struct drm_vmw_fence_wait_arg *arg =
-            (struct drm_vmw_fence_wait_arg *)data;
-        unsigned long timeout;
-
-        if (!arg->cookie_valid) {
-                arg->cookie_valid = 1;
-                arg->kernel_cookie = jiffies + VMW_FENCE_WAIT_TIMEOUT;
-        }
-
-        timeout = jiffies;
-        if (time_after_eq(timeout, (unsigned long)arg->kernel_cookie))
-                return -EBUSY;
-
-        timeout = (unsigned long)arg->kernel_cookie - timeout;
-        return vmw_wait_fence(vmw_priv(dev), true, arg->sequence, true, timeout);
-}