WebSVN – Kolibri OS – Diff – /drivers/video/drm/vmwgfx/vmwgfx_irq.c

 /**************************************************************************
+ *
- * Copyright © 2009 VMware, Inc., Palo Alto, CA., USA
+ * Copyright © 2009-2015 VMware, Inc., Palo Alto, CA., USA
  * All Rights Reserved.
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
  * "Software"), to deal in the Software without restriction, including
  * without limitation the rights to use, copy, modify, merge, publish,
  * distribute, sub license, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
+ *
  * The above copyright notice and this permission notice (including the
  * next paragraph) shall be included in all copies or substantial portions
  * of the Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
  * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
  **************************************************************************/
 #include
 #include "vmwgfx_drv.h"
-#define TASK_INTERRUPTIBLE      1
-#define TASK_UNINTERRUPTIBLE    2
 #define VMW_FENCE_WRAP (1 << 24)
 irqreturn_t vmw_irq_handler(int irq, void *arg)
+{
 	struct drm_device *dev = (struct drm_device *)arg;
 	struct vmw_private *dev_priv = vmw_priv(dev);
 	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);
+	masked_status = status & READ_ONCE(dev_priv->irq_mask);
 	if (likely(status))
 		outl(status, dev_priv->io_start + VMWGFX_IRQSTATUS_PORT);
-	if (!masked_status)
+	if (!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 (masked_status & SVGA_IRQFLAG_FIFO_PROGRESS)
 		wake_up_all(&dev_priv->fifo_queue);
 	return IRQ_HANDLED;
+}
 static bool vmw_fifo_idle(struct vmw_private *dev_priv, uint32_t seqno)
+{
-	uint32_t busy;
-	mutex_lock(&dev_priv->hw_mutex);
-	busy = vmw_read(dev_priv, SVGA_REG_BUSY);
-	mutex_unlock(&dev_priv->hw_mutex);
-	return (busy == 0);
+	return (vmw_read(dev_priv, SVGA_REG_BUSY) == 0);
+}
 void vmw_update_seqno(struct vmw_private *dev_priv,
 			 struct vmw_fifo_state *fifo_state)
+{
-	__le32 __iomem *fifo_mem = dev_priv->mmio_virt;
+	u32 *fifo_mem = dev_priv->mmio_virt;
-	uint32_t seqno = ioread32(fifo_mem + SVGA_FIFO_FENCE);
+	uint32_t seqno = vmw_mmio_read(fifo_mem + SVGA_FIFO_FENCE);
 	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_seqno_passed(struct vmw_private *dev_priv,
 			 uint32_t seqno)
+{
 	struct vmw_fifo_state *fifo_state;
 	bool ret;
 	if (likely(dev_priv->last_read_seqno - seqno < VMW_FENCE_WRAP))
 		return true;
 	fifo_state = &dev_priv->fifo;
 	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, seqno))
 		return true;
 	/**
 	 * 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->marker_seq) - seqno)
 	       > VMW_FENCE_WRAP);
 	return ret;
+}
 int vmw_fallback_wait(struct vmw_private *dev_priv,
 		      bool lazy,
 		      bool fifo_idle,
 		      uint32_t seqno,
 		      bool interruptible,
 		      unsigned long timeout)
+{
 	struct vmw_fifo_state *fifo_state = &dev_priv->fifo;
 	uint32_t count = 0;
 	uint32_t signal_seq;
 	int ret;
 	unsigned long end_jiffies = jiffies + timeout;
 	bool (*wait_condition)(struct vmw_private *, uint32_t);
 	DEFINE_WAIT(__wait);
 	wait_condition = (fifo_idle) ? &vmw_fifo_idle :
 		&vmw_seqno_passed;
 	/**
 	 * Block command submission while waiting for idle.
 	 */
 //   if (fifo_idle)
 //       down_read(&fifo_state->rwsem);
 	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, seqno))
 			break;
 		if (time_after_eq(jiffies, end_jiffies)) {
 			DRM_ERROR("SVGA device lockup.\n");
 			break;
+		}
 		if (lazy)
             delay(1);
 		else if ((++count & 0x0F) == 0) {
 			/**
 			 * FIXME: Use schedule_hr_timeout here for
 			 * newer kernels and lower CPU utilization.
 			 */
             delay(1);
+		}
+	}
 //   finish_wait(&dev_priv->fence_queue, &__wait);
 	if (ret == 0 && fifo_idle) {
-		__le32 __iomem *fifo_mem = dev_priv->mmio_virt;
+		u32 *fifo_mem = dev_priv->mmio_virt;
-		iowrite32(signal_seq, fifo_mem + SVGA_FIFO_FENCE);
+		vmw_mmio_write(signal_seq, fifo_mem + SVGA_FIFO_FENCE);
+	}
 	wake_up_all(&dev_priv->fence_queue);
 //   if (fifo_idle)
 //       up_read(&fifo_state->rwsem);
 	return ret;
+}
+void vmw_generic_waiter_add(struct vmw_private *dev_priv,
-void vmw_seqno_waiter_add(struct vmw_private *dev_priv)
+			    u32 flag, int *waiter_count)
 {
-	mutex_lock(&dev_priv->hw_mutex);
+	spin_lock(&dev_priv->waiter_lock);
-	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,
+	if ((*waiter_count)++ == 0) {
-		     dev_priv->io_start + VMWGFX_IRQSTATUS_PORT);
+		outl(flag, dev_priv->io_start + VMWGFX_IRQSTATUS_PORT);
-		dev_priv->irq_mask |= SVGA_IRQFLAG_ANY_FENCE;
+		dev_priv->irq_mask |= flag;
-		vmw_write(dev_priv, SVGA_REG_IRQMASK, dev_priv->irq_mask);
-		spin_unlock_irqrestore(&dev_priv->irq_lock, irq_flags);
+		vmw_write(dev_priv, SVGA_REG_IRQMASK, dev_priv->irq_mask);
 	}
-	mutex_unlock(&dev_priv->hw_mutex);
+	spin_unlock(&dev_priv->waiter_lock);
 }
 void vmw_generic_waiter_remove(struct vmw_private *dev_priv,
-void vmw_seqno_waiter_remove(struct vmw_private *dev_priv)
+			       u32 flag, int *waiter_count)
 {
-	mutex_lock(&dev_priv->hw_mutex);
-	if (--dev_priv->fence_queue_waiters == 0) {
-		unsigned long irq_flags;
+	spin_lock(&dev_priv->waiter_lock);
-		spin_lock_irqsave(&dev_priv->irq_lock, irq_flags);
+	if (--(*waiter_count) == 0) {
-		dev_priv->irq_mask &= ~SVGA_IRQFLAG_ANY_FENCE;
-		vmw_write(dev_priv, SVGA_REG_IRQMASK, dev_priv->irq_mask);
+		dev_priv->irq_mask &= ~flag;
-		spin_unlock_irqrestore(&dev_priv->irq_lock, irq_flags);
+		vmw_write(dev_priv, SVGA_REG_IRQMASK, dev_priv->irq_mask);
+	}
+	spin_unlock(&dev_priv->waiter_lock);
+}
+void vmw_seqno_waiter_add(struct vmw_private *dev_priv)
+{
-	mutex_unlock(&dev_priv->hw_mutex);
+	vmw_generic_waiter_add(dev_priv, SVGA_IRQFLAG_ANY_FENCE,
 			       &dev_priv->fence_queue_waiters);
+}
-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);
+void vmw_seqno_waiter_remove(struct vmw_private *dev_priv)
+{
+	vmw_generic_waiter_remove(dev_priv, SVGA_IRQFLAG_ANY_FENCE,
+				  &dev_priv->fence_queue_waiters);
+}
-		dev_priv->irq_mask |= SVGA_IRQFLAG_FENCE_GOAL;
-		vmw_write(dev_priv, SVGA_REG_IRQMASK, dev_priv->irq_mask);
+void vmw_goal_waiter_add(struct vmw_private *dev_priv)
 		spin_unlock_irqrestore(&dev_priv->irq_lock, irq_flags);
 	vmw_generic_waiter_add(dev_priv, SVGA_IRQFLAG_FENCE_GOAL,
-	mutex_unlock(&dev_priv->hw_mutex);
+			       &dev_priv->goal_queue_waiters);
+}
 void vmw_goal_waiter_remove(struct vmw_private *dev_priv)
+{
-	mutex_lock(&dev_priv->hw_mutex);
+	vmw_generic_waiter_remove(dev_priv, SVGA_IRQFLAG_FENCE_GOAL,
-	if (--dev_priv->goal_queue_waiters == 0) {
+				  &dev_priv->goal_queue_waiters);
-		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;
 	struct vmw_fifo_state *fifo = &dev_priv->fifo;
 	if (likely(dev_priv->last_read_seqno - seqno < VMW_FENCE_WRAP))
 		return 0;
 	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, seqno,
 					 interruptible, timeout);
 	if (!(dev_priv->capabilities & SVGA_CAP_IRQMASK))
 		return vmw_fallback_wait(dev_priv, lazy, false, seqno,
 					 interruptible, timeout);
 	vmw_seqno_waiter_add(dev_priv);
 	if (interruptible)
 		ret = wait_event_interruptible_timeout
 		    (dev_priv->fence_queue,
 		     vmw_seqno_passed(dev_priv, seqno),
 		     timeout);
 	else
 		ret = wait_event_timeout
 		    (dev_priv->fence_queue,
 		     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;
 	return ret;
+}
 void vmw_irq_preinstall(struct drm_device *dev)
+{
 	struct vmw_private *dev_priv = vmw_priv(dev);
 	uint32_t status;
 	if (!(dev_priv->capabilities & SVGA_CAP_IRQMASK))
 		return;
 	spin_lock_init(&dev_priv->irq_lock);
 	status = inl(dev_priv->io_start + VMWGFX_IRQSTATUS_PORT);
 	outl(status, dev_priv->io_start + VMWGFX_IRQSTATUS_PORT);
+}
 int vmw_irq_postinstall(struct drm_device *dev)
+{
 	return 0;
+}
 void vmw_irq_uninstall(struct drm_device *dev)
+{
 	struct vmw_private *dev_priv = vmw_priv(dev);
 	uint32_t status;
 	if (!(dev_priv->capabilities & SVGA_CAP_IRQMASK))
 		return;
 	mutex_lock(&dev_priv->hw_mutex);
-	vmw_write(dev_priv, SVGA_REG_IRQMASK, 0);
-	mutex_unlock(&dev_priv->hw_mutex);
+	vmw_write(dev_priv, SVGA_REG_IRQMASK, 0);
 	status = inl(dev_priv->io_start + VMWGFX_IRQSTATUS_PORT);
 	outl(status, dev_priv->io_start + VMWGFX_IRQSTATUS_PORT);
+}
-int autoremove_wake_function(wait_queue_t *wait, unsigned mode, int sync, void *key)
-{
-    list_del_init(&wait->task_list);
-    return 1;
-}

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/vmwgfx/vmwgfx_irq.c @ 4570 – Rev 5078 → 6296