Add fence error member.

Modify the TTM backend bind arguments.
Export a number of functions needed for driver-specific super-ioctls.
Add a function to map buffer objects from the kernel, regardless of where they're
currently placed.
A number of error fixes.

1 files changed, 91 insertions, 63 deletions

diff --git a/linux-core/drm_fence.c b/linux-core/drm_fence.c
index 2f16f7ef..d228547c 100644
--- a/linux-core/drm_fence.c
+++ b/linux-core/drm_fence.c
@@ -35,7 +35,7 @@
  */
 
 void drm_fence_handler(struct drm_device * dev, uint32_t class,
-		       uint32_t sequence, uint32_t type)
+		       uint32_t sequence, uint32_t type, uint32_t error)
 {
 	int wake = 0;
 	uint32_t diff;
@@ -49,6 +49,7 @@ void drm_fence_handler(struct drm_device * dev, uint32_t class,
 	int is_exe = (type & DRM_FENCE_TYPE_EXE);
 	int ge_last_exe;
 
+
 	diff = (sequence - fc->exe_flush_sequence) & driver->sequence_mask;
 
 	if (fc->pending_exe_flush && is_exe && diff < driver->wrap_diff)
@@ -57,9 +58,6 @@ void drm_fence_handler(struct drm_device * dev, uint32_t class,
 	diff = (sequence - fc->last_exe_flush) & driver->sequence_mask;
 	ge_last_exe = diff < driver->wrap_diff;
 
-	if (ge_last_exe)
-		fc->pending_flush &= ~type;
-
 	if (is_exe && ge_last_exe) {
 		fc->last_exe_flush = sequence;
 	}
@@ -75,36 +73,66 @@ void drm_fence_handler(struct drm_device * dev, uint32_t class,
 		}
 	}
 
+	fc->pending_flush &= ~type;
 	head = (found) ? &fence->ring : &fc->ring;
 
 	list_for_each_entry_safe_reverse(fence, next, head, ring) {
 		if (&fence->ring == &fc->ring)
 			break;
 
+		if (error) {
+			fence->error = error;
+			fence->signaled = fence->type;
+			fence->submitted_flush = fence->type;
+			fence->flush_mask = fence->type;
+			list_del_init(&fence->ring);
+			wake = 1;
+			break;
+		}
+
 		type |= fence->native_type;
 		relevant = type & fence->type;
 
 		if ((fence->signaled | relevant) != fence->signaled) {
 			fence->signaled |= relevant;
+			fence->flush_mask |= relevant;
+			fence->submitted_flush |= relevant;
 			DRM_DEBUG("Fence 0x%08lx signaled 0x%08x\n",
 				  fence->base.hash.key, fence->signaled);
-			fence->submitted_flush |= relevant;
 			wake = 1;
 		}
 
 		relevant = fence->flush_mask &
-		    ~(fence->signaled | fence->submitted_flush);
+			~(fence->submitted_flush | fence->signaled);
 
-		if (relevant) {
-			fc->pending_flush |= relevant;
-			fence->submitted_flush = fence->flush_mask;
-		}
+		fc->pending_flush |= relevant;
+		fence->submitted_flush |= relevant;
 
 		if (!(fence->type & ~fence->signaled)) {
 			DRM_DEBUG("Fence completely signaled 0x%08lx\n",
 				  fence->base.hash.key);
 			list_del_init(&fence->ring);
 		}
+
+	}
+
+	/*
+	 * Reinstate lost flush flags.
+	 */
+
+	if ((fc->pending_flush & type) != type) {
+	        head = head->prev;
+		list_for_each_entry(fence, head, ring) {
+			if (&fence->ring == &fc->ring)
+				break;
+	    		diff = (fc->last_exe_flush - fence->sequence) &
+				driver->sequence_mask;
+			if (diff > driver->wrap_diff)
+				break;
+
+			relevant = fence->submitted_flush & ~fence->signaled;
+			fc->pending_flush |= relevant;
+		}
 	}
 
 	if (wake) {
@@ -141,6 +169,7 @@ void drm_fence_usage_deref_locked(struct drm_fence_object ** fence)
 		drm_ctl_free(tmp_fence, sizeof(*tmp_fence), DRM_MEM_FENCE);
 	}
 }
+EXPORT_SYMBOL(drm_fence_usage_deref_locked);
 
 void drm_fence_usage_deref_unlocked(struct drm_fence_object ** fence)
 {
@@ -160,6 +189,7 @@ void drm_fence_usage_deref_unlocked(struct drm_fence_object ** fence)
 		mutex_unlock(&dev->struct_mutex);
 	}
 }
+EXPORT_SYMBOL(drm_fence_usage_deref_unlocked);
 
 struct drm_fence_object
 *drm_fence_reference_locked(struct drm_fence_object *src)
@@ -178,7 +208,7 @@ void drm_fence_reference_unlocked(struct drm_fence_object **dst,
 	atomic_inc(&src->usage);
 	mutex_unlock(&src->dev->struct_mutex);
 }
-
+EXPORT_SYMBOL(drm_fence_reference_unlocked);
 
 static void drm_fence_object_destroy(struct drm_file *priv, struct drm_user_object * base)
 {
@@ -206,6 +236,7 @@ int drm_fence_object_signaled(struct drm_fence_object * fence,
 
 	return signaled;
 }
+EXPORT_SYMBOL(drm_fence_object_signaled);
 
 static void drm_fence_flush_exe(struct drm_fence_class_manager * fc,
 				struct drm_fence_driver * driver, uint32_t sequence)
@@ -241,7 +272,8 @@ int drm_fence_object_flush(struct drm_fence_object * fence,
 
 	write_lock_irqsave(&fm->lock, flags);
 	fence->flush_mask |= type;
-	if (fence->submitted_flush == fence->signaled) {
+	if ((fence->submitted_flush & fence->signaled)
+	    == fence->submitted_flush) {
 		if ((fence->type & DRM_FENCE_TYPE_EXE) &&
 		    !(fence->submitted_flush & DRM_FENCE_TYPE_EXE)) {
 			drm_fence_flush_exe(fc, driver, fence->sequence);
@@ -329,7 +361,15 @@ static int drm_fence_lazy_wait(struct drm_fence_object *fence,
 		if (ret == -EBUSY) {
 			DRM_ERROR("Fence timeout. "
 				  "GPU lockup or fence driver was "
-				  "taken down.\n");
+				  "taken down. %d 0x%08x 0x%02x 0x%02x 0x%02x\n",
+				  fence->class,
+				  fence->sequence,
+				  fence->type,
+				  mask,
+				  fence->signaled);
+			DRM_ERROR("Pending exe flush %d 0x%08x\n",
+				  fc->pending_exe_flush,
+				  fc->exe_flush_sequence);
 		}
 		return ((ret == -EINTR) ? -EAGAIN : ret);
 	}
@@ -348,6 +388,7 @@ int drm_fence_object_wait(struct drm_fence_object * fence,
 	if (mask & ~fence->type) {
 		DRM_ERROR("Wait trying to extend fence type"
 			  " 0x%08x 0x%08x\n", mask, fence->type);
+		BUG();
 		return -EINVAL;
 	}
 
@@ -402,6 +443,8 @@ int drm_fence_object_wait(struct drm_fence_object * fence,
 
 	return 0;
 }
+EXPORT_SYMBOL(drm_fence_object_wait);
+
 
 int drm_fence_object_emit(struct drm_fence_object * fence,
 			  uint32_t fence_flags, uint32_t class, uint32_t type)
@@ -434,6 +477,7 @@ int drm_fence_object_emit(struct drm_fence_object * fence,
 	write_unlock_irqrestore(&fm->lock, flags);
 	return 0;
 }
+EXPORT_SYMBOL(drm_fence_object_emit);
 
 static int drm_fence_object_init(struct drm_device * dev, uint32_t class,
 				 uint32_t type,
@@ -545,6 +589,23 @@ void drm_fence_manager_init(struct drm_device * dev)
 	write_unlock_irqrestore(&fm->lock, flags);
 }
 
+void drm_fence_fill_arg(struct drm_fence_object *fence, struct drm_fence_arg *arg)
+{
+	struct drm_device *dev = fence->dev;
+	struct drm_fence_manager *fm = &dev->fm;
+	unsigned long irq_flags;
+
+	read_lock_irqsave(&fm->lock, irq_flags);
+	arg->handle = fence->base.hash.key;
+	arg->class = fence->class;
+	arg->type = fence->type;
+	arg->signaled = fence->signaled;
+	arg->error = fence->error;
+	read_unlock_irqrestore(&fm->lock, irq_flags);
+}
+EXPORT_SYMBOL(drm_fence_fill_arg);
+
+
 void drm_fence_manager_takedown(struct drm_device * dev)
 {
 }
@@ -572,7 +633,6 @@ int drm_fence_create_ioctl(struct drm_device *dev, void *data, struct drm_file *
 	struct drm_fence_manager *fm = &dev->fm;
 	struct drm_fence_arg *arg = data;
 	struct drm_fence_object *fence;
-	unsigned long flags;
 	ret = 0;
 
 	if (!fm->initialized) {
@@ -597,14 +657,10 @@ int drm_fence_create_ioctl(struct drm_device *dev, void *data, struct drm_file *
 	/*
 	 * usage > 0. No need to lock dev->struct_mutex;
 	 */
-	
+
 	arg->handle = fence->base.hash.key;
 
-	read_lock_irqsave(&fm->lock, flags);
-	arg->class = fence->class;
-	arg->type = fence->type;
-	arg->signaled = fence->signaled;
-	read_unlock_irqrestore(&fm->lock, flags);
+	drm_fence_fill_arg(fence, arg);
 	drm_fence_usage_deref_unlocked(&fence);
 
 	return ret;
@@ -642,7 +698,6 @@ int drm_fence_reference_ioctl(struct drm_device *dev, void *data, struct drm_fil
 	struct drm_fence_arg *arg = data;
 	struct drm_fence_object *fence;
 	struct drm_user_object *uo;
-	unsigned long flags;
 	ret = 0;
 
 	if (!fm->initialized) {
@@ -654,12 +709,7 @@ int drm_fence_reference_ioctl(struct drm_device *dev, void *data, struct drm_fil
 	if (ret)
 		return ret;
 	fence = drm_lookup_fence_object(file_priv, arg->handle);
-
-	read_lock_irqsave(&fm->lock, flags);
-	arg->class = fence->class;
-	arg->type = fence->type;
-	arg->signaled = fence->signaled;
-	read_unlock_irqrestore(&fm->lock, flags);
+	drm_fence_fill_arg(fence, arg);
 	drm_fence_usage_deref_unlocked(&fence);
 
 	return ret;
@@ -687,7 +737,6 @@ int drm_fence_signaled_ioctl(struct drm_device *dev, void *data, struct drm_file
 	struct drm_fence_manager *fm = &dev->fm;
 	struct drm_fence_arg *arg = data;
 	struct drm_fence_object *fence;
-	unsigned long flags;
 	ret = 0;
 
 	if (!fm->initialized) {
@@ -699,11 +748,7 @@ int drm_fence_signaled_ioctl(struct drm_device *dev, void *data, struct drm_file
 	if (!fence)
 		return -EINVAL;
 
-	read_lock_irqsave(&fm->lock, flags);
-	arg->class = fence->class;
-	arg->type = fence->type;
-	arg->signaled = fence->signaled;
-	read_unlock_irqrestore(&fm->lock, flags);
+	drm_fence_fill_arg(fence, arg);
 	drm_fence_usage_deref_unlocked(&fence);
 
 	return ret;
@@ -715,7 +760,6 @@ int drm_fence_flush_ioctl(struct drm_device *dev, void *data, struct drm_file *f
 	struct drm_fence_manager *fm = &dev->fm;
 	struct drm_fence_arg *arg = data;
 	struct drm_fence_object *fence;
-	unsigned long flags;
 	ret = 0;
 
 	if (!fm->initialized) {
@@ -728,11 +772,7 @@ int drm_fence_flush_ioctl(struct drm_device *dev, void *data, struct drm_file *f
 		return -EINVAL;
 	ret = drm_fence_object_flush(fence, arg->type);
 
-	read_lock_irqsave(&fm->lock, flags);
-	arg->class = fence->class;
-	arg->type = fence->type;
-	arg->signaled = fence->signaled;
-	read_unlock_irqrestore(&fm->lock, flags);
+	drm_fence_fill_arg(fence, arg);
 	drm_fence_usage_deref_unlocked(&fence);
 
 	return ret;
@@ -745,7 +785,6 @@ int drm_fence_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *fi
 	struct drm_fence_manager *fm = &dev->fm;
 	struct drm_fence_arg *arg = data;
 	struct drm_fence_object *fence;
-	unsigned long flags;
 	ret = 0;
 
 	if (!fm->initialized) {
@@ -760,11 +799,7 @@ int drm_fence_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *fi
 				    arg->flags & DRM_FENCE_FLAG_WAIT_LAZY,
 				    0, arg->type);
 
-	read_lock_irqsave(&fm->lock, flags);
-	arg->class = fence->class;
-	arg->type = fence->type;
-	arg->signaled = fence->signaled;
-	read_unlock_irqrestore(&fm->lock, flags);
+	drm_fence_fill_arg(fence, arg);
 	drm_fence_usage_deref_unlocked(&fence);
 
 	return ret;
@@ -777,7 +812,6 @@ int drm_fence_emit_ioctl(struct drm_device *dev, void *data, struct drm_file *fi
 	struct drm_fence_manager *fm = &dev->fm;
 	struct drm_fence_arg *arg = data;
 	struct drm_fence_object *fence;
-	unsigned long flags;
 	ret = 0;
 
 	if (!fm->initialized) {
@@ -792,11 +826,7 @@ int drm_fence_emit_ioctl(struct drm_device *dev, void *data, struct drm_file *fi
 	ret = drm_fence_object_emit(fence, arg->flags, arg->class,
 				    arg->type);
 
-	read_lock_irqsave(&fm->lock, flags);
-	arg->class = fence->class;
-	arg->type = fence->type;
-	arg->signaled = fence->signaled;
-	read_unlock_irqrestore(&fm->lock, flags);
+	drm_fence_fill_arg(fence, arg);
 	drm_fence_usage_deref_unlocked(&fence);
 
 	return ret;
@@ -808,7 +838,6 @@ int drm_fence_buffers_ioctl(struct drm_device *dev, void *data, struct drm_file
 	struct drm_fence_manager *fm = &dev->fm;
 	struct drm_fence_arg *arg = data;
 	struct drm_fence_object *fence;
-	unsigned long flags;
 	ret = 0;
 
 	if (!fm->initialized) {
@@ -821,23 +850,22 @@ int drm_fence_buffers_ioctl(struct drm_device *dev, void *data, struct drm_file
 		return -EINVAL;
 	}
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
-	ret = drm_fence_buffer_objects(file_priv, NULL, arg->flags,
+	ret = drm_fence_buffer_objects(dev, NULL, arg->flags,
 				       NULL, &fence);
 	if (ret)
 		return ret;
-	ret = drm_fence_add_user_object(file_priv, fence,
-					arg->flags &
-					DRM_FENCE_FLAG_SHAREABLE);
-	if (ret)
-		return ret;
+
+	if (!(arg->flags & DRM_FENCE_FLAG_NO_USER)) {
+		ret = drm_fence_add_user_object(file_priv, fence,
+						arg->flags &
+						DRM_FENCE_FLAG_SHAREABLE);
+		if (ret)
+			return ret;
+	}
 
 	arg->handle = fence->base.hash.key;
 
-	read_lock_irqsave(&fm->lock, flags);
-	arg->class = fence->class;
-	arg->type = fence->type;
-	arg->signaled = fence->signaled;
-	read_unlock_irqrestore(&fm->lock, flags);
+	drm_fence_fill_arg(fence, arg);
 	drm_fence_usage_deref_unlocked(&fence);
 
 	return ret;