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

Commit 96c5f0df authored by Thomas Hellstrom's avatar Thomas Hellstrom
Browse files

drm/vmwgfx: Add the possibility to validate a buffer as a MOB 



Also do basic consistency checking.

Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: default avatarBrian Paul <brianp@vmware.com>
Reviewed-by: default avatarZack Rusin <zackr@vmware.com>
parent afb0e50f

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ struct vmw_dma_buffer { 
struct vmw_validate_buffer {

	struct ttm_validate_buffer base;

	struct drm_hash_item hash;

	bool validate_as_mob;

};



struct vmw_res_func;
@@ -645,6 +646,7 @@ extern struct ttm_placement vmw_sys_placement; 
extern struct ttm_placement vmw_sys_ne_placement;

extern struct ttm_placement vmw_evictable_placement;

extern struct ttm_placement vmw_srf_placement;

extern struct ttm_placement vmw_mob_placement;

extern struct ttm_bo_driver vmw_bo_driver;

extern int vmw_dma_quiescent(struct drm_device *dev);

extern void vmw_piter_start(struct vmw_piter *viter,

drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c

+19 −7
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ static int vmw_cmd_ok(struct vmw_private *dev_priv, 
 *

 * @sw_context: The software context used for this command submission batch.

 * @bo: The buffer object to add.

 * @validate_as_mob: Validate this buffer as a MOB.

 * @p_val_node: If non-NULL Will be updated with the validate node number

 * on return.

 *
@@ -232,6 +233,7 @@ static int vmw_cmd_ok(struct vmw_private *dev_priv, 
 */

static int vmw_bo_to_validate_list(struct vmw_sw_context *sw_context,

				   struct ttm_buffer_object *bo,

				   bool validate_as_mob,

				   uint32_t *p_val_node)

{

	uint32_t val_node;
@@ -244,6 +246,10 @@ static int vmw_bo_to_validate_list(struct vmw_sw_context *sw_context, 
				    &hash) == 0)) {

		vval_buf = container_of(hash, struct vmw_validate_buffer,

					hash);

		if (unlikely(vval_buf->validate_as_mob != validate_as_mob)) {

			DRM_ERROR("Inconsistent buffer usage.\n");

			return -EINVAL;

		}

		val_buf = &vval_buf->base;

		val_node = vval_buf - sw_context->val_bufs;

	} else {
@@ -266,6 +272,7 @@ static int vmw_bo_to_validate_list(struct vmw_sw_context *sw_context, 
		val_buf->bo = ttm_bo_reference(bo);

		val_buf->reserved = false;

		list_add_tail(&val_buf->head, &sw_context->validate_nodes);

		vval_buf->validate_as_mob = validate_as_mob;

	}



	sw_context->fence_flags |= DRM_VMW_FENCE_FLAG_EXEC;
@@ -302,7 +309,8 @@ static int vmw_resources_reserve(struct vmw_sw_context *sw_context) 
			struct ttm_buffer_object *bo = &res->backup->base;



			ret = vmw_bo_to_validate_list

				(sw_context, bo, NULL);

				(sw_context, bo,

				 vmw_resource_needs_backup(res), NULL);



			if (unlikely(ret != 0))

				return ret;
@@ -586,7 +594,7 @@ static int vmw_query_bo_switch_prepare(struct vmw_private *dev_priv, 
			sw_context->needs_post_query_barrier = true;

			ret = vmw_bo_to_validate_list(sw_context,

						      sw_context->cur_query_bo,

						      NULL);

						      dev_priv->has_mob, NULL);

			if (unlikely(ret != 0))

				return ret;

		}
@@ -594,7 +602,7 @@ static int vmw_query_bo_switch_prepare(struct vmw_private *dev_priv, 


		ret = vmw_bo_to_validate_list(sw_context,

					      dev_priv->dummy_query_bo,

					      NULL);

					      dev_priv->has_mob, NULL);

		if (unlikely(ret != 0))

			return ret;
@@ -718,7 +726,7 @@ static int vmw_translate_guest_ptr(struct vmw_private *dev_priv, 
	reloc = &sw_context->relocs[sw_context->cur_reloc++];

	reloc->location = ptr;



	ret = vmw_bo_to_validate_list(sw_context, bo, &reloc->index);

	ret = vmw_bo_to_validate_list(sw_context, bo, false, &reloc->index);

	if (unlikely(ret != 0))

		goto out_no_reloc;
@@ -1224,7 +1232,8 @@ static void vmw_clear_validations(struct vmw_sw_context *sw_context) 
}



static int vmw_validate_single_buffer(struct vmw_private *dev_priv,

				      struct ttm_buffer_object *bo)

				      struct ttm_buffer_object *bo,

				      bool validate_as_mob)

{

	int ret;
@@ -1238,6 +1247,9 @@ static int vmw_validate_single_buffer(struct vmw_private *dev_priv, 
	     dev_priv->dummy_query_bo_pinned))

		return 0;



	if (validate_as_mob)

		return ttm_bo_validate(bo, &vmw_mob_placement, true, false);



	/**

	 * Put BO in VRAM if there is space, otherwise as a GMR.

	 * If there is no space in VRAM and GMR ids are all used up,
@@ -1259,7 +1271,6 @@ static int vmw_validate_single_buffer(struct vmw_private *dev_priv, 
	return ret;

}





static int vmw_validate_buffers(struct vmw_private *dev_priv,

				struct vmw_sw_context *sw_context)

{
@@ -1267,7 +1278,8 @@ static int vmw_validate_buffers(struct vmw_private *dev_priv, 
	int ret;



	list_for_each_entry(entry, &sw_context->validate_nodes, base.head) {

		ret = vmw_validate_single_buffer(dev_priv, entry->base.bo);

		ret = vmw_validate_single_buffer(dev_priv, entry->base.bo,

						 entry->validate_as_mob);

		if (unlikely(ret != 0))

			return ret;

	}

drivers/gpu/drm/vmwgfx/vmwgfx_resource.c

+2 −0
Original line number Diff line number Diff line
@@ -471,6 +471,8 @@ int vmw_user_dmabuf_alloc(struct vmw_private *dev_priv, 
	}



	ret = vmw_dmabuf_init(dev_priv, &user_bo->dma, size,

			      (dev_priv->has_mob) ?

			      &vmw_sys_placement :

			      &vmw_vram_sys_placement, true,

			      &vmw_user_dmabuf_destroy);

	if (unlikely(ret != 0))