Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline

1 files changed, 29 insertions, 18 deletions

diff --git a/linux-core/i915_fence.c b/linux-core/i915_fence.c
index 2182604c..88daa57c 100644
--- a/linux-core/i915_fence.c
+++ b/linux-core/i915_fence.c
@@ -42,36 +42,34 @@ static void i915_perform_flush(drm_device_t * dev)
 {
 	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 	drm_fence_manager_t *fm = &dev->fm;
+	drm_fence_class_manager_t *fc = &fm->class[0];
 	drm_fence_driver_t *driver = dev->driver->fence_driver;
 	uint32_t flush_flags = 0;
 	uint32_t flush_sequence = 0;
 	uint32_t i_status;
 	uint32_t diff;
 	uint32_t sequence;
+	int rwflush;
 
 	if (!dev_priv)
 		return;
 
-	if (fm->pending_exe_flush) {
+	if (fc->pending_exe_flush) {
 		sequence = READ_BREADCRUMB(dev_priv);
 
 		/*
 		 * First update fences with the current breadcrumb.
 		 */
 
-		diff = sequence - fm->last_exe_flush;
+		diff = sequence - fc->last_exe_flush;
 		if (diff < driver->wrap_diff && diff != 0) {
-			drm_fence_handler(dev, sequence, DRM_FENCE_TYPE_EXE);
+			drm_fence_handler(dev, 0, sequence, DRM_FENCE_TYPE_EXE);
 		}
 
-		diff = sequence - fm->exe_flush_sequence;
-		if (diff < driver->wrap_diff) {
-			fm->pending_exe_flush = 0;
-			if (dev_priv->fence_irq_on) {
-				i915_user_irq_off(dev_priv);
-				dev_priv->fence_irq_on = 0;
-			}
-		} else if (!dev_priv->fence_irq_on) {
+		if (dev_priv->fence_irq_on && !fc->pending_exe_flush) {
+			i915_user_irq_off(dev_priv);
+			dev_priv->fence_irq_on = 0;
+		} else if (!dev_priv->fence_irq_on && fc->pending_exe_flush) { 
 			i915_user_irq_on(dev_priv);
 			dev_priv->fence_irq_on = 1;
 		}
@@ -84,17 +82,18 @@ static void i915_perform_flush(drm_device_t * dev)
 			flush_flags = dev_priv->flush_flags;
 			flush_sequence = dev_priv->flush_sequence;
 			dev_priv->flush_pending = 0;
-			drm_fence_handler(dev, flush_sequence, flush_flags);
+			drm_fence_handler(dev, 0, flush_sequence, flush_flags);
 		}
 	}
 
-	if (fm->pending_flush && !dev_priv->flush_pending) {
+	rwflush = fc->pending_flush & DRM_I915_FENCE_TYPE_RW;
+	if (rwflush && !dev_priv->flush_pending) {
 		dev_priv->flush_sequence = (uint32_t) READ_BREADCRUMB(dev_priv);
-		dev_priv->flush_flags = fm->pending_flush;
+		dev_priv->flush_flags = fc->pending_flush;
 		dev_priv->saved_flush_status = READ_HWSP(dev_priv, 0);
 		I915_WRITE(I915REG_INSTPM, (1 << 5) | (1 << 21));
 		dev_priv->flush_pending = 1;
-		fm->pending_flush = 0;
+		fc->pending_flush &= ~DRM_I915_FENCE_TYPE_RW;
 	}
 
 	if (dev_priv->flush_pending) {
@@ -104,13 +103,13 @@ static void i915_perform_flush(drm_device_t * dev)
 			flush_flags = dev_priv->flush_flags;
 			flush_sequence = dev_priv->flush_sequence;
 			dev_priv->flush_pending = 0;
-			drm_fence_handler(dev, flush_sequence, flush_flags);
+			drm_fence_handler(dev, 0, flush_sequence, flush_flags);
 		}
 	}
 
 }
 
-void i915_poke_flush(drm_device_t * dev)
+void i915_poke_flush(drm_device_t * dev, uint32_t class)
 {
 	drm_fence_manager_t *fm = &dev->fm;
 	unsigned long flags;
@@ -120,7 +119,7 @@ void i915_poke_flush(drm_device_t * dev)
 	write_unlock_irqrestore(&fm->lock, flags);
 }
 
-int i915_fence_emit_sequence(drm_device_t * dev, uint32_t flags,
+int i915_fence_emit_sequence(drm_device_t * dev, uint32_t class, uint32_t flags,
 			     uint32_t * sequence, uint32_t * native_type)
 {
 	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -144,3 +143,15 @@ void i915_fence_handler(drm_device_t * dev)
 	i915_perform_flush(dev);
 	write_unlock(&fm->lock);
 }
+
+int i915_fence_has_irq(drm_device_t *dev, uint32_t class, uint32_t flags)
+{
+	/*
+	 * We have an irq that tells us when we have a new breadcrumb.
+	 */
+
+	if (class == 0 && flags == DRM_FENCE_TYPE_EXE)
+		return 1;
+
+	return 0;
+}