Commit 6d820003 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/ttm: drop move notify around move. 



The drivers now do this in the move callback.

move_notify is still needed in the destroy path.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201020010319.1692445-7-airlied@gmail.com
parent 28ee846e

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+10 −3
Original line number Diff line number Diff line
@@ -666,6 +666,8 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict, 
	struct ttm_resource *old_mem = &bo->mem;

	int r;



	amdgpu_bo_move_notify(bo, evict, new_mem);



	/* Can't move a pinned BO */

	abo = ttm_to_amdgpu_bo(bo);

	if (WARN_ON_ONCE(abo->tbo.pin_count > 0))
@@ -687,7 +689,7 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict, 
	    new_mem->mem_type == TTM_PL_SYSTEM) {

		r = ttm_bo_wait_ctx(bo, ctx);

		if (r)

			return r;

			goto fail;



		amdgpu_ttm_backend_unbind(bo->bdev, bo->ttm);

		ttm_resource_free(bo, &bo->mem);
@@ -728,12 +730,12 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict, 
		if (!amdgpu_mem_visible(adev, old_mem) ||

		    !amdgpu_mem_visible(adev, new_mem)) {

			pr_err("Move buffer fallback to memcpy unavailable\n");

			return r;

			goto fail;

		}



		r = ttm_bo_move_memcpy(bo, ctx, new_mem);

		if (r)

			return r;

			goto fail;

	}



	if (bo->type == ttm_bo_type_device &&
@@ -748,6 +750,11 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict, 
	/* update statistics */

	atomic64_add((u64)bo->num_pages << PAGE_SHIFT, &adev->num_bytes_moved);

	return 0;

fail:

	swap(*new_mem, bo->mem);

	amdgpu_bo_move_notify(bo, false, new_mem);

	swap(*new_mem, bo->mem);

	return r;

}



/**

drivers/gpu/drm/drm_gem_vram_helper.c

+10 −1
Original line number Diff line number Diff line
@@ -590,7 +590,16 @@ static int drm_gem_vram_bo_driver_move(struct drm_gem_vram_object *gbo, 
				       struct ttm_operation_ctx *ctx,

				       struct ttm_resource *new_mem)

{

	return ttm_bo_move_memcpy(&gbo->bo, ctx, new_mem);

	int ret;



	drm_gem_vram_bo_driver_move_notify(gbo, evict, new_mem);

	ret = ttm_bo_move_memcpy(&gbo->bo, ctx, new_mem);

	if (ret) {

		swap(*new_mem, gbo->bo.mem);

		drm_gem_vram_bo_driver_move_notify(gbo, false, new_mem);

		swap(*new_mem, gbo->bo.mem);

	}

	return ret;

}



/*

drivers/gpu/drm/nouveau/nouveau_bo.c

+9 −3
Original line number Diff line number Diff line
@@ -1032,9 +1032,10 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, 
	struct nouveau_drm_tile *new_tile = NULL;

	int ret = 0;



	nouveau_bo_move_ntfy(bo, evict, new_reg);

	ret = ttm_bo_wait_ctx(bo, ctx);

	if (ret)

		return ret;

		goto out_ntfy;



	if (nvbo->bo.pin_count)

		NV_WARN(drm, "Moving pinned object %p!\n", nvbo);
@@ -1042,7 +1043,7 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, 
	if (drm->client.device.info.family < NV_DEVICE_INFO_V0_TESLA) {

		ret = nouveau_bo_vm_bind(bo, new_reg, &new_tile);

		if (ret)

			return ret;

			goto out_ntfy;

	}



	/* Fake bo copy. */
@@ -1090,7 +1091,12 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, 
		else

			nouveau_bo_vm_cleanup(bo, new_tile, &nvbo->tile);

	}



out_ntfy:

	if (ret) {

		swap(*new_reg, bo->mem);

		nouveau_bo_move_ntfy(bo, false, new_reg);

		swap(*new_reg, bo->mem);

	}

	return ret;

}

drivers/gpu/drm/qxl/qxl_ttm.c

+27 −18
Original line number Diff line number Diff line
@@ -136,6 +136,22 @@ static struct ttm_tt *qxl_ttm_tt_create(struct ttm_buffer_object *bo, 
	return ttm;

}



static void qxl_bo_move_notify(struct ttm_buffer_object *bo,

			       bool evict,

			       struct ttm_resource *new_mem)

{

	struct qxl_bo *qbo;

	struct qxl_device *qdev;



	if (!qxl_ttm_bo_is_qxl_bo(bo))

		return;

	qbo = to_qxl_bo(bo);

	qdev = to_qxl(qbo->tbo.base.dev);



	if (bo->mem.mem_type == TTM_PL_PRIV && qbo->surface_id)

		qxl_surface_evict(qdev, qbo, new_mem ? true : false);

}



static int qxl_bo_move(struct ttm_buffer_object *bo, bool evict,

		       struct ttm_operation_ctx *ctx,

		       struct ttm_resource *new_mem)
@@ -143,31 +159,24 @@ static int qxl_bo_move(struct ttm_buffer_object *bo, bool evict, 
	struct ttm_resource *old_mem = &bo->mem;

	int ret;



	qxl_bo_move_notify(bo, evict, new_mem);



	ret = ttm_bo_wait_ctx(bo, ctx);

	if (ret)

		return ret;

		goto out;



	if (old_mem->mem_type == TTM_PL_SYSTEM && bo->ttm == NULL) {

		ttm_bo_move_null(bo, new_mem);

		return 0;

	}

	return ttm_bo_move_memcpy(bo, ctx, new_mem);

	ret = ttm_bo_move_memcpy(bo, ctx, new_mem);

out:

	if (ret) {

		swap(*new_mem, bo->mem);

		qxl_bo_move_notify(bo, false, new_mem);

		swap(*new_mem, bo->mem);

	}



static void qxl_bo_move_notify(struct ttm_buffer_object *bo,

			       bool evict,

			       struct ttm_resource *new_mem)

{

	struct qxl_bo *qbo;

	struct qxl_device *qdev;



	if (!qxl_ttm_bo_is_qxl_bo(bo))

		return;

	qbo = to_qxl_bo(bo);

	qdev = to_qxl(qbo->tbo.base.dev);



	if (bo->mem.mem_type == TTM_PL_PRIV && qbo->surface_id)

		qxl_surface_evict(qdev, qbo, new_mem ? true : false);

	return ret;

}



static struct ttm_bo_driver qxl_bo_driver = {

drivers/gpu/drm/radeon/radeon_ttm.c

+9 −2
Original line number Diff line number Diff line
@@ -311,9 +311,11 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict, 
	struct ttm_resource *old_mem = &bo->mem;

	int r;



	radeon_bo_move_notify(bo, evict, new_mem);



	r = ttm_bo_wait_ctx(bo, ctx);

	if (r)

		return r;

		goto fail;



	/* Can't move a pinned BO */

	rbo = container_of(bo, struct radeon_bo, tbo);
@@ -359,13 +361,18 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict, 
memcpy:

		r = ttm_bo_move_memcpy(bo, ctx, new_mem);

		if (r) {

			return r;

			goto fail;

		}

	}



	/* update statistics */

	atomic64_add((u64)bo->num_pages << PAGE_SHIFT, &rdev->num_bytes_moved);

	return 0;

fail:

	swap(*new_mem, bo->mem);

	radeon_bo_move_notify(bo, false, new_mem);

	swap(*new_mem, bo->mem);

	return r;

}



static int radeon_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_resource *mem)