Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96bf8b87 authored by Jerome Glisse's avatar Jerome Glisse Committed by Dave Airlie
Browse files

drm/vmwgfx: add support for new TTM fault callback V5 



This add the support for the new fault callback, does change anything
from driver point of view.

Improvement: store the aperture base in a variable so that we don't
call a function to get it on each fault.

Patch hasn't been tested.

V2 don't derefence bo->mem.mm_node as it's not NULL only for
   VRAM or GTT
V3 update after io_mem_reserve/io_mem_free callback balancing
V4 callback has to ioremap
V5 ioremap is done by TTM

Signed-off-by: default avatarJerome Glisse <jglisse@redhat.com>
Reviewed-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent f32f02fd

drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c

+41 −3
Original line number Diff line number Diff line
@@ -153,8 +153,7 @@ int vmw_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, 
		man->gpu_offset = 0;

		man->io_offset = dev_priv->vram_start;

		man->io_size = dev_priv->vram_size;

		man->flags = TTM_MEMTYPE_FLAG_FIXED |

		    TTM_MEMTYPE_FLAG_NEEDS_IOREMAP | TTM_MEMTYPE_FLAG_MAPPABLE;

		man->flags = TTM_MEMTYPE_FLAG_FIXED | TTM_MEMTYPE_FLAG_MAPPABLE;

		man->io_addr = NULL;

		man->available_caching = TTM_PL_MASK_CACHING;

		man->default_caching = TTM_PL_FLAG_WC;
@@ -193,6 +192,42 @@ 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_mem_type_manager *man = &bdev->man[mem->mem_type];

	struct vmw_private *dev_priv = container_of(bdev, struct vmw_private, bdev);



	mem->bus.addr = NULL;

	mem->bus.is_iomem = false;

	mem->bus.offset = 0;

	mem->bus.size = mem->num_pages << PAGE_SHIFT;

	mem->bus.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:

		mem->bus.offset = mem->mm_node->start << PAGE_SHIFT;

		mem->bus.base = dev_priv->vram_start;

		mem->bus.is_iomem = true;

		break;

	default:

		return -EINVAL;

	}

	return 0;

}



static void vmw_ttm_io_mem_free(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)

{

}



static int vmw_ttm_fault_reserve_notify(struct ttm_buffer_object *bo)

{

	return 0;

}



/**

 * FIXME: We're using the old vmware polling method to sync.

 * Do this with fences instead.
@@ -248,5 +283,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_notify = &vmw_ttm_fault_reserve_notify,

	.io_mem_reserve = &vmw_ttm_io_mem_reserve,

	.io_mem_free = &vmw_ttm_io_mem_free,

};