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

 /**************************************************************************
+ *
- * Copyright © 2011 VMware, Inc., Palo Alto, CA., USA
+ * Copyright © 2011-2014 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
 	uint32_t pending_actions[VMW_ACTION_MAX];
 	struct mutex goal_irq_mutex;
 	bool goal_irq_on; /* Protected by @goal_irq_mutex */
 	bool seqno_valid; /* Protected by @lock, and may not be set to true
 			     without the @goal_irq_mutex held. */
+	unsigned ctx;
 };
 struct vmw_user_fence {
 	struct ttm_base_object base;
 	uint32_t *tv_sec;
 	uint32_t *tv_usec;
+};
+static struct vmw_fence_manager *
+fman_from_fence(struct vmw_fence_obj *fence)
+{
+	return container_of(fence->base.lock, struct vmw_fence_manager, lock);
 };
 /**
  * Note on fencing subsystem usage of irqs:
  * Typically the vmw_fences_update function is called
+ *
  * The fence goal seqno irq is on as long as there are unsignaled fence
  * objects with actions attached to them.
  */
-static void vmw_fence_obj_destroy_locked(struct kref *kref)
+static void vmw_fence_obj_destroy(struct fence *f)
+{
 	struct vmw_fence_obj *fence =
-		container_of(kref, struct vmw_fence_obj, kref);
+		container_of(f, struct vmw_fence_obj, base);
+	struct vmw_fence_manager *fman = fman_from_fence(fence);
-	struct vmw_fence_manager *fman = fence->fman;
+	unsigned long irq_flags;
-	unsigned int num_fences;
+	spin_lock_irqsave(&fman->lock, irq_flags);
-	list_del_init(&fence->head);
-	num_fences = --fman->num_fence_objects;
+	list_del_init(&fence->head);
-	spin_unlock_irq(&fman->lock);
+	--fman->num_fence_objects;
-	if (fence->destroy)
+	spin_unlock_irqrestore(&fman->lock, irq_flags);
+	fence->destroy(fence);
-		fence->destroy(fence);
+}
+static const char *vmw_fence_get_driver_name(struct fence *f)
+{
+	return "vmwgfx";
+}
 	else
+static const char *vmw_fence_get_timeline_name(struct fence *f)
+{
+	return "svga";
+}
+static bool vmw_fence_enable_signaling(struct fence *f)
+{
+	struct vmw_fence_obj *fence =
+		container_of(f, struct vmw_fence_obj, base);
+	struct vmw_fence_manager *fman = fman_from_fence(fence);
+	struct vmw_private *dev_priv = fman->dev_priv;
+	u32 *fifo_mem = dev_priv->mmio_virt;
+	u32 seqno = vmw_mmio_read(fifo_mem + SVGA_FIFO_FENCE);
+	if (seqno - fence->base.seqno < VMW_FENCE_WRAP)
+		return false;
+	vmw_fifo_ping_host(dev_priv, SVGA_SYNC_GENERIC);
+	return true;
+}
+struct vmwgfx_wait_cb {
+	struct fence_cb base;
+	struct task_struct *task;
+};
+static void
+vmwgfx_wait_cb(struct fence *fence, struct fence_cb *cb)
+{
+	struct vmwgfx_wait_cb *wait =
+		container_of(cb, struct vmwgfx_wait_cb, base);
+//   wake_up_process(wait->task);
+}
+static void __vmw_fences_update(struct vmw_fence_manager *fman);
+static long vmw_fence_wait(struct fence *f, bool intr, signed long timeout)
+{
+	struct vmw_fence_obj *fence =
+		container_of(f, struct vmw_fence_obj, base);
+	struct vmw_fence_manager *fman = fman_from_fence(fence);
+	struct vmw_private *dev_priv = fman->dev_priv;
+	struct vmwgfx_wait_cb cb;
+	long ret = timeout;
+	unsigned long irq_flags;
+	if (likely(vmw_fence_obj_signaled(fence)))
+		return timeout;
+	vmw_fifo_ping_host(dev_priv, SVGA_SYNC_GENERIC);
+	vmw_seqno_waiter_add(dev_priv);
+	spin_lock_irqsave(f->lock, irq_flags);
+//   if (intr && signal_pending(current)) {
+//       ret = -ERESTARTSYS;
+//       goto out;
+//   }
+	cb.base.func = vmwgfx_wait_cb;
+	cb.task = current;
+	list_add(&cb.base.node, &f->cb_list);
+	while (ret > 0) {
+		__vmw_fences_update(fman);
+		if (test_bit(FENCE_FLAG_SIGNALED_BIT, &f->flags))
+			break;
+		spin_unlock_irqrestore(f->lock, irq_flags);
+//		ret = schedule_timeout(ret);
+		delay(1);
+		ret = 0;
+		spin_lock_irqsave(f->lock, irq_flags);
+//       if (ret > 0 && intr && signal_pending(current))
+//           ret = -ERESTARTSYS;
+	}
+	if (!list_empty(&cb.base.node))
+		list_del(&cb.base.node);
+out:
+	spin_unlock_irqrestore(f->lock, irq_flags);
+	vmw_seqno_waiter_remove(dev_priv);
+	return ret;
+}
+static struct fence_ops vmw_fence_ops = {
+	.get_driver_name = vmw_fence_get_driver_name,
+	.get_timeline_name = vmw_fence_get_timeline_name,
-		kfree(fence);
+	.enable_signaling = vmw_fence_enable_signaling,
 	.wait = vmw_fence_wait,
-	spin_lock_irq(&fman->lock);
+	.release = vmw_fence_obj_destroy,
 };
 	fman->user_fence_size = ttm_round_pot(sizeof(struct vmw_user_fence));
 	fman->fence_size = ttm_round_pot(sizeof(struct vmw_fence_obj));
 	fman->event_fence_action_size =
 		ttm_round_pot(sizeof(struct vmw_event_fence_action));
 	mutex_init(&fman->goal_irq_mutex);
+	fman->ctx = fence_context_alloc(1);
 	return fman;
+}
 	BUG_ON(!lists_empty);
 	kfree(fman);
+}
 static int vmw_fence_obj_init(struct vmw_fence_manager *fman,
-			      struct vmw_fence_obj *fence,
-			      u32 seqno,
-			      uint32_t mask,
+			      struct vmw_fence_obj *fence, u32 seqno,
 			      void (*destroy) (struct vmw_fence_obj *fence))
+{
-	unsigned long irq_flags;
-	unsigned int num_fences;
+	unsigned long irq_flags;
+	int ret = 0;
-	int ret = 0;
 	fence_init(&fence->base, &vmw_fence_ops, &fman->lock,
-	fence->seqno = seqno;
-	INIT_LIST_HEAD(&fence->seq_passed_actions);
-	fence->fman = fman;
-	fence->signaled = 0;
-	fence->signal_mask = mask;
+		   fman->ctx, seqno);
-	kref_init(&fence->kref);
-	fence->destroy = destroy;
+	INIT_LIST_HEAD(&fence->seq_passed_actions);
-	init_waitqueue_head(&fence->queue);
+	fence->destroy = destroy;
 	spin_lock_irqsave(&fman->lock, irq_flags);
 	if (unlikely(fman->fifo_down)) {
 		ret = -EBUSY;
 		goto out_unlock;
+	}
 	list_add_tail(&fence->head, &fman->fence_list);
-	num_fences = ++fman->num_fence_objects;
+	++fman->num_fence_objects;
-out_unlock:
-	spin_unlock_irqrestore(&fman->lock, irq_flags);
-	return ret;
-}
-struct vmw_fence_obj *vmw_fence_obj_reference(struct vmw_fence_obj *fence)
-{
-	if (unlikely(fence == NULL))
-		return NULL;
-	kref_get(&fence->kref);
-	return fence;
-}
-/**
- * vmw_fence_obj_unreference
- *
- * Note that this function may not be entered with disabled irqs since
- * it may re-enable them in the destroy function.
- *
- */
-void vmw_fence_obj_unreference(struct vmw_fence_obj **fence_p)
-{
-	struct vmw_fence_obj *fence = *fence_p;
-	struct vmw_fence_manager *fman;
-	if (unlikely(fence == NULL))
-		return;
-	fman = fence->fman;
-	*fence_p = NULL;
-	spin_lock_irq(&fman->lock);
+out_unlock:
-	BUG_ON(atomic_read(&fence->kref.refcount) == 0);
+	spin_unlock_irqrestore(&fman->lock, irq_flags);
-	kref_put(&fence->kref, vmw_fence_obj_destroy_locked);
+	return ret;
 	spin_unlock_irq(&fman->lock);
  */
 static bool vmw_fence_goal_new_locked(struct vmw_fence_manager *fman,
 				      u32 passed_seqno)
+{
 	u32 goal_seqno;
-	__le32 __iomem *fifo_mem;
+	u32 *fifo_mem;
 	struct vmw_fence_obj *fence;
 	if (likely(!fman->seqno_valid))
 		return false;
 	fifo_mem = fman->dev_priv->mmio_virt;
-	goal_seqno = ioread32(fifo_mem + SVGA_FIFO_FENCE_GOAL);
+	goal_seqno = vmw_mmio_read(fifo_mem + SVGA_FIFO_FENCE_GOAL);
 	if (likely(passed_seqno - goal_seqno >= VMW_FENCE_WRAP))
 		return false;
 	fman->seqno_valid = false;
 	list_for_each_entry(fence, &fman->fence_list, head) {
 		if (!list_empty(&fence->seq_passed_actions)) {
 			fman->seqno_valid = true;
-			iowrite32(fence->seqno,
+			vmw_mmio_write(fence->base.seqno,
-				  fifo_mem + SVGA_FIFO_FENCE_GOAL);
+				       fifo_mem + SVGA_FIFO_FENCE_GOAL);
+ *
  * returns true if the device goal seqno was updated. False otherwise.
  */
 static bool vmw_fence_goal_check_locked(struct vmw_fence_obj *fence)
+{
+	struct vmw_fence_manager *fman = fman_from_fence(fence);
 	u32 goal_seqno;
-	__le32 __iomem *fifo_mem;
+	u32 *fifo_mem;
-	if (fence->signaled & DRM_VMW_FENCE_FLAG_EXEC)
+	if (fence_is_signaled_locked(&fence->base))
 		return false;
-	fifo_mem = fence->fman->dev_priv->mmio_virt;
+	fifo_mem = fman->dev_priv->mmio_virt;
-	goal_seqno = ioread32(fifo_mem + SVGA_FIFO_FENCE_GOAL);
+	goal_seqno = vmw_mmio_read(fifo_mem + SVGA_FIFO_FENCE_GOAL);
-	if (likely(fence->fman->seqno_valid &&
+	if (likely(fman->seqno_valid &&
-		   goal_seqno - fence->seqno < VMW_FENCE_WRAP))
+		   goal_seqno - fence->base.seqno < VMW_FENCE_WRAP))
 		return false;
-	iowrite32(fence->seqno, fifo_mem + SVGA_FIFO_FENCE_GOAL);
+	vmw_mmio_write(fence->base.seqno, fifo_mem + SVGA_FIFO_FENCE_GOAL);
-	fence->fman->seqno_valid = true;
+	fman->seqno_valid = true;
-	return true;
 	return true;
+}
 void vmw_fences_update(struct vmw_fence_manager *fman)
 static void __vmw_fences_update(struct vmw_fence_manager *fman)
-	unsigned long flags;
+{
 	struct vmw_fence_obj *fence, *next_fence;
 	struct list_head action_list;
-	bool needs_rerun;
-	uint32_t seqno, new_seqno;
+	bool needs_rerun;
-	__le32 __iomem *fifo_mem = fman->dev_priv->mmio_virt;
+	uint32_t seqno, new_seqno;
 	u32 *fifo_mem = fman->dev_priv->mmio_virt;
-	seqno = ioread32(fifo_mem + SVGA_FIFO_FENCE);
-rerun:
+	seqno = vmw_mmio_read(fifo_mem + SVGA_FIFO_FENCE);
-	spin_lock_irqsave(&fman->lock, flags);
+rerun:
 	list_for_each_entry_safe(fence, next_fence, &fman->fence_list, head) {
-		if (seqno - fence->seqno < VMW_FENCE_WRAP) {
+		if (seqno - fence->base.seqno < VMW_FENCE_WRAP) {
-			list_del_init(&fence->head);
-			fence->signaled |= DRM_VMW_FENCE_FLAG_EXEC;
+			list_del_init(&fence->head);
-			INIT_LIST_HEAD(&action_list);
+			fence_signal_locked(&fence->base);
-			list_splice_init(&fence->seq_passed_actions,
+			INIT_LIST_HEAD(&action_list);
-					 &action_list);
-			vmw_fences_perform_actions(fman, &action_list);
-			wake_up_all(&fence->queue);
-		} else
-			break;
-	}
 			list_splice_init(&fence->seq_passed_actions,
-	needs_rerun = vmw_fence_goal_new_locked(fman, seqno);
+					 &action_list);
 			vmw_fences_perform_actions(fman, &action_list);
-//   if (!list_empty(&fman->cleanup_list))
+		} else
-//       (void) schedule_work(&fman->work);
+			break;
+	}
 	spin_unlock_irqrestore(&fman->lock, flags);
+	/*
-	/*
+	 * Rerun if the fence goal seqno was updated, and the
-	 * Rerun if the fence goal seqno was updated, and the
+	 * hardware might have raced with that update, so that
-	 * hardware might have raced with that update, so that
+	 * we missed a fence_goal irq.
-	 * we missed a fence_goal irq.
+	 */
 	 */
+	needs_rerun = vmw_fence_goal_new_locked(fman, seqno);
 	if (unlikely(needs_rerun)) {
-	if (unlikely(needs_rerun)) {
+		new_seqno = vmw_mmio_read(fifo_mem + SVGA_FIFO_FENCE);
-		new_seqno = ioread32(fifo_mem + SVGA_FIFO_FENCE);
 		if (new_seqno != seqno) {
-			seqno = new_seqno;
-			goto rerun;
+			seqno = new_seqno;
-		}
 			goto rerun;
-}
+		}
+	}
+}
+void vmw_fences_update(struct vmw_fence_manager *fman)
+{
-bool vmw_fence_obj_signaled(struct vmw_fence_obj *fence,
-			    uint32_t flags)
+	unsigned long irq_flags;
-	struct vmw_fence_manager *fman = fence->fman;
-	unsigned long irq_flags;
+	spin_lock_irqsave(&fman->lock, irq_flags);
-	uint32_t signaled;
-	spin_lock_irqsave(&fman->lock, irq_flags);
-	signaled = fence->signaled;
-	spin_unlock_irqrestore(&fman->lock, irq_flags);
+	__vmw_fences_update(fman);
 	spin_unlock_irqrestore(&fman->lock, irq_flags);
-	flags &= fence->signal_mask;
+}
-	if ((signaled & flags) == flags)
 		return 1;
 bool vmw_fence_obj_signaled(struct vmw_fence_obj *fence)
-	if ((signaled & DRM_VMW_FENCE_FLAG_EXEC) == 0)
+{
-		vmw_fences_update(fman);
+	struct vmw_fence_manager *fman = fman_from_fence(fence);
 	spin_lock_irqsave(&fman->lock, irq_flags);
-	signaled = fence->signaled;
-	spin_unlock_irqrestore(&fman->lock, irq_flags);
-	return ((signaled & flags) == flags);
-}
+	if (test_bit(FENCE_FLAG_SIGNALED_BIT, &fence->base.flags))
-int vmw_fence_obj_wait(struct vmw_fence_obj *fence,
-		       uint32_t flags, bool lazy,
-		       bool interruptible, unsigned long timeout)
+		return 1;
-	struct vmw_private *dev_priv = fence->fman->dev_priv;
-	long ret;
-	if (likely(vmw_fence_obj_signaled(fence, flags)))
-		return 0;
-	vmw_fifo_ping_host(dev_priv, SVGA_SYNC_GENERIC);
-	vmw_seqno_waiter_add(dev_priv);
-	if (interruptible)
-		ret = wait_event_interruptible_timeout
-			(fence->queue,
-			 vmw_fence_obj_signaled(fence, flags),
+	vmw_fences_update(fman);
 			 timeout);
-	else
+	return fence_is_signaled(&fence->base);
 		ret = wait_event_timeout
-			(fence->queue,
-			 vmw_fence_obj_signaled(fence, flags),
+int vmw_fence_obj_wait(struct vmw_fence_obj *fence, bool lazy,
-			 timeout);
+		       bool interruptible, unsigned long timeout)
+{
-	vmw_seqno_waiter_remove(dev_priv);
+	long ret = fence_wait_timeout(&fence->base, interruptible, timeout);
-	if (unlikely(ret == 0))
-		ret = -EBUSY;
-	else if (likely(ret > 0))
-		ret = 0;
-	return ret;
-}
 	if (likely(ret > 0))
-void vmw_fence_obj_flush(struct vmw_fence_obj *fence)
+		return 0;
 	else if (ret == 0)
-	struct vmw_private *dev_priv = fence->fman->dev_priv;
 		return -EBUSY;
-	vmw_fifo_ping_host(dev_priv, SVGA_SYNC_GENERIC);
+	else
-}
 		return ret;
 static void vmw_fence_destroy(struct vmw_fence_obj *fence)
-{
-	struct vmw_fence_manager *fman = fence->fman;
-	kfree(fence);
-	/*
 	 * Free kernel space accounting.
-	 */
+void vmw_fence_obj_flush(struct vmw_fence_obj *fence)
-	ttm_mem_global_free(vmw_mem_glob(fman->dev_priv),
+{
-			    fman->fence_size);
-}
+	struct vmw_private *dev_priv = fman_from_fence(fence)->dev_priv;
 int vmw_fence_create(struct vmw_fence_manager *fman,
-		     uint32_t seqno,
+	vmw_fifo_ping_host(dev_priv, SVGA_SYNC_GENERIC);
 		     uint32_t mask,
 		     struct vmw_fence_obj **p_fence)
 static void vmw_fence_destroy(struct vmw_fence_obj *fence)
 	struct ttm_mem_global *mem_glob = vmw_mem_glob(fman->dev_priv);
-	struct vmw_fence_obj *fence;
+	fence_free(&fence->base);
-	int ret;
 	ret = ttm_mem_global_alloc(mem_glob, fman->fence_size,
 				   false, false);
-	if (unlikely(ret != 0))
+int vmw_fence_create(struct vmw_fence_manager *fman,
-		return ret;
+		     uint32_t seqno,
 		     struct vmw_fence_obj **p_fence)
 	fence = kzalloc(sizeof(*fence), GFP_KERNEL);
-	if (unlikely(fence == NULL)) {
+	struct vmw_fence_obj *fence;
-		ret = -ENOMEM;
+	int ret;
 		goto out_no_object;
 	fence = kzalloc(sizeof(*fence), GFP_KERNEL);
 	if (unlikely(fence == NULL))
-	ret = vmw_fence_obj_init(fman, fence, seqno, mask,
+		return -ENOMEM;
 				 vmw_fence_destroy);
+}
 int vmw_user_fence_create(struct drm_file *file_priv,
 			  struct vmw_fence_manager *fman,
-			  uint32_t seqno,
-			  uint32_t mask,
+			  uint32_t seqno,
 			  struct vmw_fence_obj **p_fence,
 			  uint32_t *p_handle)
+{
 	struct ttm_object_file *tfile = vmw_fpriv(file_priv)->tfile;
 		ret = -ENOMEM;
 		goto out_no_object;
+	}
 	ret = vmw_fence_obj_init(fman, &ufence->fence, seqno,
-				 mask, vmw_user_fence_destroy);
+				 vmw_user_fence_destroy);
 	if (unlikely(ret != 0)) {
 		kfree(ufence);
 		goto out_no_object;
  * vmw_fence_fifo_down - signal all unsignaled fence objects.
  */
 void vmw_fence_fifo_down(struct vmw_fence_manager *fman)
-{
 	unsigned long irq_flags;
 	struct list_head action_list;
 	int ret;
 	/*
 	 * The list may be altered while we traverse it, so always
 	 * restart when we've released the fman->lock.
 	 */
-	spin_lock_irqsave(&fman->lock, irq_flags);
+	spin_lock_irq(&fman->lock);
 	fman->fifo_down = true;
 	while (!list_empty(&fman->fence_list)) {
 		struct vmw_fence_obj *fence =
 			list_entry(fman->fence_list.prev, struct vmw_fence_obj,
 				   head);
-		kref_get(&fence->kref);
-		spin_unlock_irq(&fman->lock);
+		fence_get(&fence->base);
 		spin_unlock_irq(&fman->lock);
 		ret = vmw_fence_obj_wait(fence, fence->signal_mask,
-					 false, false,
+		ret = vmw_fence_obj_wait(fence, false, false,
 					 VMW_FENCE_WAIT_TIMEOUT);
 		if (unlikely(ret != 0)) {
 			list_del_init(&fence->head);
-			fence->signaled |= DRM_VMW_FENCE_FLAG_EXEC;
-			INIT_LIST_HEAD(&action_list);
+			fence_signal(&fence->base);
-			list_splice_init(&fence->seq_passed_actions,
-					 &action_list);
-			vmw_fences_perform_actions(fman, &action_list);
+			INIT_LIST_HEAD(&action_list);
-			wake_up_all(&fence->queue);
+			list_splice_init(&fence->seq_passed_actions,
+					 &action_list);
 			vmw_fences_perform_actions(fman, &action_list);
+		}
 		spin_lock_irq(&fman->lock);
 		BUG_ON(!list_empty(&fence->head));
-		BUG_ON(!list_empty(&fence->head));
+		fence_put(&fence->base);
-		kref_put(&fence->kref, vmw_fence_obj_destroy_locked);
+		spin_lock_irq(&fman->lock);
 	fence = &(container_of(base, struct vmw_user_fence, base)->fence);
 	timeout = jiffies;
 	if (time_after_eq(timeout, (unsigned long)arg->kernel_cookie)) {
-		ret = ((vmw_fence_obj_signaled(fence, arg->flags)) ?
+		ret = ((vmw_fence_obj_signaled(fence)) ?
 : -EBUSY);
 		goto out;
 	}
 	timeout = (unsigned long)arg->kernel_cookie - timeout;
 		       (unsigned long)arg->handle);
 		return -EINVAL;
+	}
 	fence = &(container_of(base, struct vmw_user_fence, base)->fence);
-	fman = fence->fman;
+	fman = fman_from_fence(fence);
-	arg->signaled = vmw_fence_obj_signaled(fence, arg->flags);
+	arg->signaled = vmw_fence_obj_signaled(fence);
 	spin_lock_irq(&fman->lock);
 	arg->signaled_flags = arg->flags;
-	arg->signaled_flags = fence->signaled;
+	spin_lock_irq(&fman->lock);
 	if (unlikely(event == NULL))
 		return;
 	file_priv = event->file_priv;
 	spin_lock_irqsave(&dev->event_lock, irq_flags);
 /*
 	if (likely(eaction->tv_sec != NULL)) {
 		struct timeval tv;
-		do_gettimeofday(&tv);
+//       do_gettimeofday(&tv);
 		*eaction->tv_sec = tv.tv_sec;
 		*eaction->tv_usec = tv.tv_usec;
+	}
 */
 	list_del_init(&eaction->fpriv_head);
 	list_add_tail(&eaction->event->link, &file_priv->event_list);
 	eaction->event = NULL;
  */
 static void vmw_event_fence_action_cleanup(struct vmw_fence_action *action)
+{
 	struct vmw_event_fence_action *eaction =
 		container_of(action, struct vmw_event_fence_action, action);
-	struct vmw_fence_manager *fman = eaction->fence->fman;
+	struct vmw_fence_manager *fman = fman_from_fence(eaction->fence);
 	unsigned long irq_flags;
 	spin_lock_irqsave(&fman->lock, irq_flags);
 	list_del(&eaction->fpriv_head);
  * returns.
  */
 static void vmw_fence_obj_add_action(struct vmw_fence_obj *fence,
 			      struct vmw_fence_action *action)
+{
-	struct vmw_fence_manager *fman = fence->fman;
+	struct vmw_fence_manager *fman = fman_from_fence(fence);
 	unsigned long irq_flags;
 	bool run_update = false;
 	mutex_lock(&fman->goal_irq_mutex);
 	spin_lock_irqsave(&fman->lock, irq_flags);
 	fman->pending_actions[action->type]++;
-	if (fence->signaled & DRM_VMW_FENCE_FLAG_EXEC) {
+	if (fence_is_signaled_locked(&fence->base)) {
 		struct list_head action_list;
 				 uint32_t *tv_sec,
 				 uint32_t *tv_usec,
 				 bool interruptible)
+{
 	struct vmw_event_fence_action *eaction;
-	struct vmw_fence_manager *fman = fence->fman;
+	struct vmw_fence_manager *fman = fman_from_fence(fence);
 	struct vmw_fpriv *vmw_fp = vmw_fpriv(file_priv);
 	unsigned long irq_flags;
 	eaction = kzalloc(sizeof(*eaction), GFP_KERNEL);
 				  uint32_t flags,
 				  uint64_t user_data,
 				  bool interruptible)
+{
 	struct vmw_event_fence_pending *event;
+	struct vmw_fence_manager *fman = fman_from_fence(fence);
-	struct drm_device *dev = fence->fman->dev_priv->dev;
+	struct drm_device *dev = fman->dev_priv->dev;
 	unsigned long irq_flags;
 	int ret;
 						   NULL,
 						   interruptible);
 	if (ret != 0)
 		goto out_no_queue;
+	return 0;
 out_no_queue:
 	event->base.destroy(&event->base);
 out_no_event:
 	spin_lock_irqsave(&dev->event_lock, irq_flags);
+		}
+	}
-	BUG_ON(fence == NULL);
 	BUG_ON(fence == NULL);
 	if (arg->flags & DRM_VMW_FE_FLAG_REQ_TIME)
-		ret = vmw_event_fence_action_create(file_priv, fence,
+	ret = vmw_event_fence_action_create(file_priv, fence,
-						    arg->flags,
+					    arg->flags,
-						    arg->user_data,
-						    true);
-	else
-		ret = vmw_event_fence_action_create(file_priv, fence,
-						    arg->flags,
-						    arg->user_data,
-						    true);
+					    arg->user_data,
 					    true);
 	if (unlikely(ret != 0)) {
 		if (ret != -ERESTARTSYS)
 			DRM_ERROR("Failed to attach event to fence.\n");
 					  handle, TTM_REF_USAGE);
 out_no_ref_obj:
 	vmw_fence_obj_unreference(&fence);
 	return ret;
+}
 #endif

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/vmwgfx/vmwgfx_fence.c – Rev 5078 → 6296