[4/9] drm/vmwgfx: add support for new TTM fault callback V2

Commit Message

Jerome Glisse Feb. 23, 2010, 2:40 p.m. UTC

None

Patch

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
index 825ebe3..aa09062 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
@@ -193,6 +193,37 @@  static void vmw_swap_notify(struct ttm_buffer_object *bo)
 	vmw_dmabuf_gmr_unbind(bo);
 }
 
+static int vmw_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem, struct ttm_bus_placement *pl)
+{
+	struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
+	struct vmw_private *dev_priv = container_of(bdev, struct vmw_private, bdev);
+
+	pl->is_iomem = false;
+	pl->offset = 0;
+	pl->size = mem->num_pages << PAGE_SHIFT;
+	pl->base = 0;
+	if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE))
+		return -EINVAL;
+	switch (mem->mem_type) {
+	case TTM_PL_SYSTEM:
+		/* System memory */
+		return 0;
+	case TTM_PL_VRAM:
+		pl->offset = mem->mm_node->start << PAGE_SHIFT;
+		pl->base = dev_priv->vram_start;
+		pl->is_iomem = true;
+		break;
+	default:
+		return -EINVAL;
+	}
+	return 0;
+}
+
+static int vmw_ttm_fault(struct ttm_buffer_object *bo, struct ttm_bus_placement *pl)
+{
+	return vmw_ttm_io_mem_reserve(bo->bdev, &bo->mem, pl);
+}
+
 /**
  * FIXME: We're using the old vmware polling method to sync.
  * Do this with fences instead.
@@ -248,5 +279,8 @@  struct ttm_bo_driver vmw_bo_driver = {
 	.sync_obj_unref = vmw_sync_obj_unref,
 	.sync_obj_ref = vmw_sync_obj_ref,
 	.move_notify = vmw_move_notify,
-	.swap_notify = vmw_swap_notify
+	.swap_notify = vmw_swap_notify,
+	.fault_reserve = vmw_ttm_fault,
+	.io_mem_reserve = &vmw_ttm_io_mem_reserve,
+	.io_mem_free = NULL,
 };