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

drm/ttm: replace last move_notify with delete_mem_notify 



The move notify callback is only used in one place, this should
be removed in the future, but for now just rename it to the use
case which is to notify the driver that the GPU memory is to be
deleted.

Drivers can be cleaned up after this separately.

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/20201021044031.1752624-2-airlied@gmail.com
parent 439c3b01

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

+7 −1
Original line number Diff line number Diff line
@@ -1730,6 +1730,12 @@ static int amdgpu_ttm_access_memory(struct ttm_buffer_object *bo, 
	return ret;

}



static void

amdgpu_bo_delete_mem_notify(struct ttm_buffer_object *bo)

{

	amdgpu_bo_move_notify(bo, false, NULL);

}



static struct ttm_bo_driver amdgpu_bo_driver = {

	.ttm_tt_create = &amdgpu_ttm_tt_create,

	.ttm_tt_populate = &amdgpu_ttm_tt_populate,
@@ -1739,7 +1745,7 @@ static struct ttm_bo_driver amdgpu_bo_driver = { 
	.evict_flags = &amdgpu_evict_flags,

	.move = &amdgpu_bo_move,

	.verify_access = &amdgpu_verify_access,

	.move_notify = &amdgpu_bo_move_notify,

	.delete_mem_notify = &amdgpu_bo_delete_mem_notify,

	.release_notify = &amdgpu_bo_release_notify,

	.io_mem_reserve = &amdgpu_ttm_io_mem_reserve,

	.io_mem_pfn = amdgpu_ttm_io_mem_pfn,

drivers/gpu/drm/drm_gem_vram_helper.c

+3 −5
Original line number Diff line number Diff line
@@ -949,9 +949,7 @@ static void bo_driver_evict_flags(struct ttm_buffer_object *bo, 
	drm_gem_vram_bo_driver_evict_flags(gbo, placement);

}



static void bo_driver_move_notify(struct ttm_buffer_object *bo,

				  bool evict,

				  struct ttm_resource *new_mem)

static void bo_driver_delete_mem_notify(struct ttm_buffer_object *bo)

{

	struct drm_gem_vram_object *gbo;
@@ -961,7 +959,7 @@ static void bo_driver_move_notify(struct ttm_buffer_object *bo, 


	gbo = drm_gem_vram_of_bo(bo);



	drm_gem_vram_bo_driver_move_notify(gbo, evict, new_mem);

	drm_gem_vram_bo_driver_move_notify(gbo, false, NULL);

}



static int bo_driver_move(struct ttm_buffer_object *bo,
@@ -1002,7 +1000,7 @@ static struct ttm_bo_driver bo_driver = { 
	.eviction_valuable = ttm_bo_eviction_valuable,

	.evict_flags = bo_driver_evict_flags,

	.move = bo_driver_move,

	.move_notify = bo_driver_move_notify,

	.delete_mem_notify = bo_driver_delete_mem_notify,

	.io_mem_reserve = bo_driver_io_mem_reserve,

};

drivers/gpu/drm/nouveau/nouveau_bo.c

+7 −1
Original line number Diff line number Diff line
@@ -1401,6 +1401,12 @@ nouveau_bo_fence(struct nouveau_bo *nvbo, struct nouveau_fence *fence, bool excl 
		dma_resv_add_shared_fence(resv, &fence->base);

}



static void

nouveau_bo_delete_mem_notify(struct ttm_buffer_object *bo)

{

	nouveau_bo_move_ntfy(bo, false, NULL);

}



struct ttm_bo_driver nouveau_bo_driver = {

	.ttm_tt_create = &nouveau_ttm_tt_create,

	.ttm_tt_populate = &nouveau_ttm_tt_populate,
@@ -1408,7 +1414,7 @@ struct ttm_bo_driver nouveau_bo_driver = { 
	.ttm_tt_destroy = &nouveau_ttm_tt_destroy,

	.eviction_valuable = ttm_bo_eviction_valuable,

	.evict_flags = nouveau_bo_evict_flags,

	.move_notify = nouveau_bo_move_ntfy,

	.delete_mem_notify = nouveau_bo_delete_mem_notify,

	.move = nouveau_bo_move,

	.verify_access = nouveau_bo_verify_access,

	.io_mem_reserve = &nouveau_ttm_io_mem_reserve,

drivers/gpu/drm/qxl/qxl_ttm.c

+6 −1
Original line number Diff line number Diff line
@@ -166,6 +166,11 @@ static int qxl_bo_move(struct ttm_buffer_object *bo, bool evict, 
	return ret;

}



static void qxl_bo_delete_mem_notify(struct ttm_buffer_object *bo)

{

	qxl_bo_move_notify(bo, false, NULL);

}



static struct ttm_bo_driver qxl_bo_driver = {

	.ttm_tt_create = &qxl_ttm_tt_create,

	.ttm_tt_destroy = &qxl_ttm_backend_destroy,
@@ -173,7 +178,7 @@ static struct ttm_bo_driver qxl_bo_driver = { 
	.evict_flags = &qxl_evict_flags,

	.move = &qxl_bo_move,

	.io_mem_reserve = &qxl_ttm_io_mem_reserve,

	.move_notify = &qxl_bo_move_notify,

	.delete_mem_notify = &qxl_bo_delete_mem_notify,

};



static int qxl_ttm_init_mem_type(struct qxl_device *qdev,

drivers/gpu/drm/radeon/radeon_ttm.c

+7 −1
Original line number Diff line number Diff line
@@ -824,6 +824,12 @@ bool radeon_ttm_tt_is_readonly(struct radeon_device *rdev, 
	return !!(gtt->userflags & RADEON_GEM_USERPTR_READONLY);

}



static void

radeon_bo_delete_mem_notify(struct ttm_buffer_object *bo)

{

	radeon_bo_move_notify(bo, false, NULL);

}



static struct ttm_bo_driver radeon_bo_driver = {

	.ttm_tt_create = &radeon_ttm_tt_create,

	.ttm_tt_populate = &radeon_ttm_tt_populate,
@@ -833,7 +839,7 @@ static struct ttm_bo_driver radeon_bo_driver = { 
	.evict_flags = &radeon_evict_flags,

	.move = &radeon_bo_move,

	.verify_access = &radeon_verify_access,

	.move_notify = &radeon_bo_move_notify,

	.delete_mem_notify = &radeon_bo_delete_mem_notify,

	.io_mem_reserve = &radeon_ttm_io_mem_reserve,

};