Commit fbe86ca5 authored by Christian König's avatar Christian König
Browse files

drm/vmwgfx: switch over to the new pin interface v2 



Stop using TTM_PL_FLAG_NO_EVICT.

v2: fix unconditional pinning

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Link: https://patchwork.freedesktop.org/patch/391601/?series=81973&rev=1
parent b254557c

drivers/gpu/drm/vmwgfx/vmwgfx_blit.c

+2 −2
Original line number Diff line number Diff line
@@ -459,9 +459,9 @@ int vmw_bo_cpu_blit(struct ttm_buffer_object *dst, 
	int ret = 0;



	/* Buffer objects need to be either pinned or reserved: */

	if (!(dst->mem.placement & TTM_PL_FLAG_NO_EVICT))

	if (!(dst->pin_count))

		dma_resv_assert_held(dst->base.resv);

	if (!(src->mem.placement & TTM_PL_FLAG_NO_EVICT))

	if (!(src->pin_count))

		dma_resv_assert_held(src->base.resv);



	if (!ttm_tt_is_populated(dst->ttm)) {

drivers/gpu/drm/vmwgfx/vmwgfx_bo.c

+25 −24
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ int vmw_bo_pin_in_placement(struct vmw_private *dev_priv, 
	if (unlikely(ret != 0))

		goto err;



	if (buf->pin_count > 0)

	if (buf->base.pin_count > 0)

		ret = ttm_bo_mem_compat(placement, &bo->mem,

					&new_flags) == true ? 0 : -EINVAL;

	else
@@ -155,7 +155,7 @@ int vmw_bo_pin_in_vram_or_gmr(struct vmw_private *dev_priv, 
	if (unlikely(ret != 0))

		goto err;



	if (buf->pin_count > 0) {

	if (buf->base.pin_count > 0) {

		ret = ttm_bo_mem_compat(&vmw_vram_gmr_placement, &bo->mem,

					&new_flags) == true ? 0 : -EINVAL;

		goto out_unreserve;
@@ -246,12 +246,12 @@ int vmw_bo_pin_in_start_of_vram(struct vmw_private *dev_priv, 
	if (bo->mem.mem_type == TTM_PL_VRAM &&

	    bo->mem.start < bo->num_pages &&

	    bo->mem.start > 0 &&

	    buf->pin_count == 0) {

	    buf->base.pin_count == 0) {

		ctx.interruptible = false;

		(void) ttm_bo_validate(bo, &vmw_sys_placement, &ctx);

	}



	if (buf->pin_count > 0)

	if (buf->base.pin_count > 0)

		ret = ttm_bo_mem_compat(&placement, &bo->mem,

					&new_flags) == true ? 0 : -EINVAL;

	else
@@ -343,23 +343,13 @@ void vmw_bo_pin_reserved(struct vmw_buffer_object *vbo, bool pin) 


	dma_resv_assert_held(bo->base.resv);



	if (pin) {

		if (vbo->pin_count++ > 0)

	if (pin == !!bo->pin_count)

		return;

	} else {

		WARN_ON(vbo->pin_count <= 0);

		if (--vbo->pin_count > 0)

			return;

	}



	pl.fpfn = 0;

	pl.lpfn = 0;

	pl.mem_type = bo->mem.mem_type;

	pl.flags = bo->mem.placement;

	if (pin)

		pl.flags |= TTM_PL_FLAG_NO_EVICT;

	else

		pl.flags &= ~TTM_PL_FLAG_NO_EVICT;



	memset(&placement, 0, sizeof(placement));

	placement.num_placement = 1;
@@ -368,8 +358,12 @@ void vmw_bo_pin_reserved(struct vmw_buffer_object *vbo, bool pin) 
	ret = ttm_bo_validate(bo, &placement, &ctx);



	BUG_ON(ret != 0 || bo->mem.mem_type != old_mem_type);

}



	if (pin)

		ttm_bo_pin(bo);

	else

		ttm_bo_unpin(bo);

}



/**

 * vmw_bo_map_and_cache - Map a buffer object and cache the map
@@ -539,6 +533,7 @@ int vmw_bo_create_kernel(struct vmw_private *dev_priv, unsigned long size, 
 * @size: Buffer object size in bytes.

 * @placement: Initial placement.

 * @interruptible: Whether waits should be performed interruptible.

 * @pin: If the BO should be created pinned at a fixed location.

 * @bo_free: The buffer object destructor.

 * Returns: Zero on success, negative error code on error.

 *
@@ -547,9 +542,10 @@ int vmw_bo_create_kernel(struct vmw_private *dev_priv, unsigned long size, 
int vmw_bo_init(struct vmw_private *dev_priv,

		struct vmw_buffer_object *vmw_bo,

		size_t size, struct ttm_placement *placement,

		bool interruptible,

		bool interruptible, bool pin,

		void (*bo_free)(struct ttm_buffer_object *bo))

{

	struct ttm_operation_ctx ctx = { interruptible, false };

	struct ttm_bo_device *bdev = &dev_priv->bdev;

	size_t acc_size;

	int ret;
@@ -563,11 +559,16 @@ int vmw_bo_init(struct vmw_private *dev_priv, 
	vmw_bo->base.priority = 3;

	vmw_bo->res_tree = RB_ROOT;



	ret = ttm_bo_init(bdev, &vmw_bo->base, size,

	ret = ttm_bo_init_reserved(bdev, &vmw_bo->base, size,

				   ttm_bo_type_device, placement,

			  0, interruptible, acc_size,

			  NULL, NULL, bo_free);

				   0, &ctx, acc_size, NULL, NULL, bo_free);

	if (unlikely(ret))

		return ret;



	if (pin)

		ttm_bo_pin(&vmw_bo->base);

	ttm_bo_unreserve(&vmw_bo->base);

	return 0;

}
@@ -656,7 +657,7 @@ int vmw_user_bo_alloc(struct vmw_private *dev_priv, 
	ret = vmw_bo_init(dev_priv, &user_bo->vbo, size,

			  (dev_priv->has_mob) ?

			  &vmw_sys_placement :

			  &vmw_vram_sys_placement, true,

			  &vmw_vram_sys_placement, true, false,

			  &vmw_user_bo_destroy);

	if (unlikely(ret != 0))

		return ret;

drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c

+2 −2
Original line number Diff line number Diff line
@@ -410,8 +410,8 @@ static int vmw_cotable_resize(struct vmw_resource *res, size_t new_size) 
	if (!buf)

		return -ENOMEM;



	ret = vmw_bo_init(dev_priv, buf, new_size, &vmw_mob_ne_placement,

			  true, vmw_bo_bo_free);

	ret = vmw_bo_init(dev_priv, buf, new_size, &vmw_mob_placement,

			  true, true, vmw_bo_bo_free);

	if (ret) {

		DRM_ERROR("Failed initializing new cotable MOB.\n");

		return ret;

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ static int vmw_dummy_query_bo_create(struct vmw_private *dev_priv) 
		return -ENOMEM;



	ret = vmw_bo_init(dev_priv, vbo, PAGE_SIZE,

			  &vmw_sys_ne_placement, false,

			  &vmw_sys_placement, false, true,

			  &vmw_bo_bo_free);

	if (unlikely(ret != 0))

		return ret;

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+1 −6
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ struct vmw_fpriv { 
 * struct vmw_buffer_object - TTM buffer object with vmwgfx additions

 * @base: The TTM buffer object

 * @res_tree: RB tree of resources using this buffer object as a backing MOB

 * @pin_count: pin depth

 * @cpu_writers: Number of synccpu write grabs. Protected by reservation when

 * increased. May be decreased without reservation.

 * @dx_query_ctx: DX context if this buffer object is used as a DX query MOB
@@ -110,7 +109,6 @@ struct vmw_fpriv { 
struct vmw_buffer_object {

	struct ttm_buffer_object base;

	struct rb_root res_tree;

	s32 pin_count;

	atomic_t cpu_writers;

	/* Not ref-counted.  Protected by binding_mutex */

	struct vmw_resource *dx_query_ctx;
@@ -852,7 +850,7 @@ extern int vmw_bo_create_kernel(struct vmw_private *dev_priv, 
extern int vmw_bo_init(struct vmw_private *dev_priv,

		       struct vmw_buffer_object *vmw_bo,

		       size_t size, struct ttm_placement *placement,

		       bool interruptible,

		       bool interruptible, bool pin,

		       void (*bo_free)(struct ttm_buffer_object *bo));

extern int vmw_user_bo_verify_access(struct ttm_buffer_object *bo,

				     struct ttm_object_file *tfile);
@@ -1009,15 +1007,12 @@ extern void vmw_validation_mem_init_ttm(struct vmw_private *dev_priv, 


extern const size_t vmw_tt_size;

extern struct ttm_placement vmw_vram_placement;

extern struct ttm_placement vmw_vram_ne_placement;

extern struct ttm_placement vmw_vram_sys_placement;

extern struct ttm_placement vmw_vram_gmr_placement;

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_placement vmw_mob_ne_placement;

extern struct ttm_placement vmw_nonfixed_placement;

extern struct ttm_bo_driver vmw_bo_driver;

extern const struct vmw_sg_table *