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

 /**************************************************************************
+ *
- * Copyright © 2011 VMware, Inc., Palo Alto, CA., USA
+ * Copyright © 2011-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
 #include
 #include "vmwgfx_drv.h"
 /**
- * vmw_dmabuf_to_placement - Validate a buffer to placement.
+ * vmw_dmabuf_pin_in_placement - Validate a buffer to placement.
+ *
  * @dev_priv:  Driver private.
  * @buf:  DMA buffer to move.
- * @pin:  Pin buffer if true.
+ * @placement:  The placement to pin it.
- * @interruptible:  Use interruptible wait.
- *
- * May only be called by the current master since it assumes that the
- * master lock is the current master's lock.
- * This function takes the master's lock in write mode.
- * Flushes and unpins the query bo to avoid failures.
+ * @interruptible:  Use interruptible wait.
+ *
  * Returns
  *  -ERESTARTSYS if interrupted by a signal.
  */
-int vmw_dmabuf_to_placement(struct vmw_private *dev_priv,
+int vmw_dmabuf_pin_in_placement(struct vmw_private *dev_priv,
-			    struct vmw_dma_buffer *buf,
+				struct vmw_dma_buffer *buf,
-			    struct ttm_placement *placement,
+				struct ttm_placement *placement,
-			    bool interruptible)
+				bool interruptible)
+{
 	struct ttm_buffer_object *bo = &buf->base;
 	int ret;
-//   ret = ttm_write_lock(&vmaster->lock, interruptible);
+	ret = ttm_write_lock(&dev_priv->reservation_sem, interruptible);
-//   if (unlikely(ret != 0))
+	if (unlikely(ret != 0))
-//       return ret;
+		return ret;
 	vmw_execbuf_release_pinned_bo(dev_priv);
+	ret = ttm_bo_reserve(bo, interruptible, false, false, NULL);
 	if (unlikely(ret != 0))
-	ret = ttm_bo_reserve(bo, interruptible, false, false, NULL);
+		goto err;
-	if (unlikely(ret != 0))
-		goto err;
+	ret = ttm_bo_validate(bo, placement, interruptible, false);
 	if (!ret)
-	ret = ttm_bo_validate(bo, placement, interruptible, false);
+		vmw_bo_pin_reserved(buf, true);
 	ttm_bo_unreserve(bo);
-err:
-//   ttm_write_unlock(&vmaster->lock);
-	return ret;
+err:
 	ttm_write_unlock(&dev_priv->reservation_sem);
 	return ret;
 /**
  * vmw_dmabuf_to_vram_or_gmr - Move a buffer to vram or gmr.
 /**
- * May only be called by the current master since it assumes that the
+ * vmw_dmabuf_pin_in_vram_or_gmr - Move a buffer to vram or gmr.
  * master lock is the current master's lock.
- * This function takes the master's lock in write mode.
+ * This function takes the reservation_sem in write mode.
- * Flushes and unpins the query bo if @pin == true to avoid failures.
+ * Flushes and unpins the query bo to avoid failures.
  *
  * @dev_priv:  Driver private.
  * @buf:  DMA buffer to move.
  * @pin:  Pin buffer if true.
  * @interruptible:  Use interruptible wait.
- *
  * Returns
- * -ERESTARTSYS if interrupted by a signal.
+ * Returns
- */
+ * -ERESTARTSYS if interrupted by a signal.
-int vmw_dmabuf_to_vram_or_gmr(struct vmw_private *dev_priv,
+ */
-			      struct vmw_dma_buffer *buf,
-			      bool pin, bool interruptible)
+int vmw_dmabuf_pin_in_vram_or_gmr(struct vmw_private *dev_priv,
 				  struct vmw_dma_buffer *buf,
-	struct ttm_buffer_object *bo = &buf->base;
+				  bool interruptible)
 	struct ttm_placement *placement;
-	int ret;
-//   ret = ttm_write_lock(&vmaster->lock, interruptible);
-//   if (unlikely(ret != 0))
-//       return ret;
-	if (pin)
-		vmw_execbuf_release_pinned_bo(dev_priv);
+	struct ttm_buffer_object *bo = &buf->base;
-	ret = ttm_bo_reserve(bo, interruptible, false, false, NULL);
+	int ret;
-	if (unlikely(ret != 0))
-		goto err;
 	/**
-	 * Put BO in VRAM if there is space, otherwise as a GMR.
+	ret = ttm_write_lock(&dev_priv->reservation_sem, interruptible);
+	if (unlikely(ret != 0))
-	 * If there is no space in VRAM and GMR ids are all used up,
-	 * start evicting GMRs to make room. If the DMA buffer can't be
-	 * used as a GMR, this will return -ENOMEM.
+		return ret;
-	 */
-	if (pin)
-		placement = &vmw_vram_gmr_ne_placement;
-	else
-		placement = &vmw_vram_gmr_placement;
+	vmw_execbuf_release_pinned_bo(dev_priv);
-	ret = ttm_bo_validate(bo, placement, interruptible, false);
-	if (likely(ret == 0) || ret == -ERESTARTSYS)
 		goto err_unreserve;
 	ret = ttm_bo_reserve(bo, interruptible, false, false, NULL);
+	if (unlikely(ret != 0))
-	/**
+		goto err;
 	 * If that failed, try VRAM again, this time evicting
-	 * previous contents.
+	ret = ttm_bo_validate(bo, &vmw_vram_gmr_placement, interruptible,
-	 */
+			      false);
 	if (likely(ret == 0) || ret == -ERESTARTSYS)
-	if (pin)
+		goto out_unreserve;
-		placement = &vmw_vram_ne_placement;
-	else
-		placement = &vmw_vram_placement;
+	ret = ttm_bo_validate(bo, &vmw_vram_placement, interruptible, false);
-	ret = ttm_bo_validate(bo, placement, interruptible, false);
+out_unreserve:
-err_unreserve:
+	if (!ret)
-	ttm_bo_unreserve(bo);
+		vmw_bo_pin_reserved(buf, true);
 err:
-//   ttm_write_unlock(&vmaster->lock);
+	ttm_bo_unreserve(bo);
-	return ret;
+err:
-}
+	ttm_write_unlock(&dev_priv->reservation_sem);
 	return ret;
-/**
+}
  * vmw_dmabuf_to_vram - Move a buffer to vram.
- *
- * May only be called by the current master since it assumes that the
- * master lock is the current master's lock.
- * This function takes the master's lock in write mode.
- *
- * @dev_priv:  Driver private.
- * @buf:  DMA buffer to move.
- * @pin:  Pin buffer in vram if true.
+/**
- * @interruptible:  Use interruptible wait.
  * vmw_dmabuf_pin_in_vram - Move a buffer to vram.
  * Returns
- * -ERESTARTSYS if interrupted by a signal.
+ * This function takes the reservation_sem in write mode.
- */
+ * Flushes and unpins the query bo to avoid failures.
 int vmw_dmabuf_to_vram(struct vmw_private *dev_priv,
-		       struct vmw_dma_buffer *buf,
-		       bool pin, bool interruptible)
-{
+ * @dev_priv:  Driver private.
-	struct ttm_placement *placement;
+ * @buf:  DMA buffer to move.
  * @interruptible:  Use interruptible wait.
 	if (pin)
-		placement = &vmw_vram_ne_placement;
+ * Returns
-	else
-		placement = &vmw_vram_placement;
+ * -ERESTARTSYS if interrupted by a signal.
  */
-	return vmw_dmabuf_to_placement(dev_priv, buf,
+int vmw_dmabuf_pin_in_vram(struct vmw_private *dev_priv,
-				       placement,
+			   struct vmw_dma_buffer *buf,
-				       interruptible);
+			   bool interruptible)
-}
+{
 	return vmw_dmabuf_pin_in_placement(dev_priv, buf, &vmw_vram_placement,
-/**
+					   interruptible);
  * vmw_dmabuf_to_start_of_vram - Move a buffer to start of vram.
- * May only be called by the current master since it assumes that the
+/**
+ * vmw_dmabuf_pin_in_start_of_vram - Move a buffer to start of vram.
  * master lock is the current master's lock.
+ * This function takes the reservation_sem in write mode.
- * This function takes the master's lock in write mode.
+ * Flushes and unpins the query bo to avoid failures.
- * Flushes and unpins the query bo if @pin == true to avoid failures.
+ *
- *
+ * @dev_priv:  Driver private.
- * @dev_priv:  Driver private.
+ * @buf:  DMA buffer to pin.
- * @buf:  DMA buffer to move.
+ * @interruptible:  Use interruptible wait.
- * @pin:  Pin buffer in vram if true.
+ *
- * @interruptible:  Use interruptible wait.
+ * Returns
- *
+ * -ERESTARTSYS if interrupted by a signal.
- * Returns
+ */
- * -ERESTARTSYS if interrupted by a signal.
- */
+int vmw_dmabuf_pin_in_start_of_vram(struct vmw_private *dev_priv,
-int vmw_dmabuf_to_start_of_vram(struct vmw_private *dev_priv,
+				    struct vmw_dma_buffer *buf,
-				struct vmw_dma_buffer *buf,
+				    bool interruptible)
 				bool pin, bool interruptible)
+	struct ttm_buffer_object *bo = &buf->base;
-{
+	struct ttm_placement placement;
+	struct ttm_place place;
+	int ret = 0;
-	struct ttm_buffer_object *bo = &buf->base;
+	place = vmw_vram_placement.placement[0];
-	struct ttm_placement placement;
+	place.lpfn = bo->num_pages;
-	int ret = 0;
+	placement.num_placement = 1;
 	placement.placement = &place;
-	if (pin)
+	placement.num_busy_placement = 1;
-		placement = vmw_vram_ne_placement;
+	placement.busy_placement = &place;
 	else
+	ret = ttm_write_lock(&dev_priv->reservation_sem, interruptible);
+	if (unlikely(ret != 0))
-		placement = vmw_vram_placement;
+		return ret;
 	placement.lpfn = bo->num_pages;
+	vmw_execbuf_release_pinned_bo(dev_priv);
-//   ret = ttm_write_lock(&vmaster->lock, interruptible);
+	ret = ttm_bo_reserve(bo, interruptible, false, false, NULL);
-//   if (unlikely(ret != 0))
+	if (unlikely(ret != 0))
-//       return ret;
 		goto err_unlock;
-	if (pin)
-		vmw_execbuf_release_pinned_bo(dev_priv);
+	/*
-	ret = ttm_bo_reserve(bo, interruptible, false, false, NULL);
-	if (unlikely(ret != 0))
-		goto err_unlock;
+	 * Is this buffer already in vram but not at the start of it?
 	 * In that case, evict it first because TTM isn't good at handling
-	/* Is this buffer already in vram but not at the start of it? */
+	 * that situation.
-	if (bo->mem.mem_type == TTM_PL_VRAM &&
+	 */
-	    bo->mem.start < bo->num_pages &&
+	if (bo->mem.mem_type == TTM_PL_VRAM &&
-	    bo->mem.start > 0)
+	    bo->mem.start < bo->num_pages &&
  */
 int vmw_dmabuf_unpin(struct vmw_private *dev_priv,
 		     struct vmw_dma_buffer *buf,
 		     bool interruptible)
+{
+	struct ttm_buffer_object *bo = &buf->base;
+	int ret;
-	/*
-	 * We could in theory early out if the buffer is
+	ret = ttm_read_lock(&dev_priv->reservation_sem, interruptible);
-	 * unpinned but we need to lock and reserve the buffer
+	if (unlikely(ret != 0))
-	 * anyways so we don't gain much by that.
+		return ret;
-	 */
-	return vmw_dmabuf_to_placement(dev_priv, buf,
+	ret = ttm_bo_reserve(bo, interruptible, false, false, NULL);
-				       &vmw_evictable_placement,
+	if (unlikely(ret != 0))
-				       interruptible);
+		goto err;
-}
+	vmw_bo_pin_reserved(buf, false);
+	ttm_bo_unreserve(bo);
+err:
+	ttm_read_unlock(&dev_priv->reservation_sem);
+	return ret;
+}
 /**
  * vmw_bo_get_guest_ptr - Get the guest ptr representing the current placement
+	}
+}
 /**
- * vmw_bo_pin - Pin or unpin a buffer object without moving it.
+ * vmw_bo_pin_reserved - Pin or unpin a buffer object without moving it.
+ *
- * @bo: The buffer object. Must be reserved.
+ * @vbo: The buffer object. Must be reserved.
  * @pin: Whether to pin or unpin.
  *
  */
-void vmw_bo_pin(struct ttm_buffer_object *bo, bool pin)
+void vmw_bo_pin_reserved(struct vmw_dma_buffer *vbo, bool pin)
+{
+	struct ttm_place pl;
-	uint32_t pl_flags;
+	struct ttm_placement placement;
-	struct ttm_placement placement;
+	struct ttm_buffer_object *bo = &vbo->base;
 	uint32_t old_mem_type = bo->mem.mem_type;
+	int ret;
+	lockdep_assert_held(&bo->resv->lock.base);
+	if (pin) {
+		if (vbo->pin_count++ > 0)
+			return;
+	} else {
+		WARN_ON(vbo->pin_count <= 0);
+		if (--vbo->pin_count > 0)
+			return;
-	int ret;
+	}
-	lockdep_assert_held(&bo->resv->lock.base);
+	pl.fpfn = 0;
+	pl.lpfn = 0;
-	pl_flags = TTM_PL_FLAG_VRAM | VMW_PL_FLAG_GMR | VMW_PL_FLAG_MOB
+	pl.flags = TTM_PL_FLAG_VRAM | VMW_PL_FLAG_GMR | VMW_PL_FLAG_MOB
 		| TTM_PL_FLAG_SYSTEM | TTM_PL_FLAG_CACHED;
 	if (pin)
-		pl_flags |= TTM_PL_FLAG_NO_EVICT;
+		pl.flags |= TTM_PL_FLAG_NO_EVICT;
 	memset(&placement, 0, sizeof(placement));

Subversion Repositories Kolibri OS

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