Commit 66257db7 authored by Nicolai Hähnle's avatar Nicolai Hähnle Committed by Alex Deucher
Browse files

drm/ttm: add evict parameter to ttm_bo_driver::move_notify 



Ensure that the driver can listen to evictions even when they don't take the
path through ttm_bo_driver::move.

This is crucial for amdgpu, which relies on an eviction counter to skip
re-binding page tables when possible.

Signed-off-by: default avatarNicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 714b1f53

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

+1 −0
Original line number Diff line number Diff line
@@ -849,6 +849,7 @@ int amdgpu_bo_get_metadata(struct amdgpu_bo *bo, void *buffer, 
}



void amdgpu_bo_move_notify(struct ttm_buffer_object *bo,

			   bool evict,

			   struct ttm_mem_reg *new_mem)

{

	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev);

drivers/gpu/drm/amd/amdgpu/amdgpu_object.h

+2 −1
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ int amdgpu_bo_get_metadata(struct amdgpu_bo *bo, void *buffer, 
			   size_t buffer_size, uint32_t *metadata_size,

			   uint64_t *flags);

void amdgpu_bo_move_notify(struct ttm_buffer_object *bo,

			   bool evict,

			   struct ttm_mem_reg *new_mem);

int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo);

void amdgpu_bo_fence(struct amdgpu_bo *bo, struct dma_fence *fence,

drivers/gpu/drm/nouveau/nouveau_bo.c

+2 −1
Original line number Diff line number Diff line
@@ -1194,7 +1194,8 @@ out: 
}



static void

nouveau_bo_move_ntfy(struct ttm_buffer_object *bo, struct ttm_mem_reg *new_mem)

nouveau_bo_move_ntfy(struct ttm_buffer_object *bo, bool evict,

		     struct ttm_mem_reg *new_mem)

{

	struct nouveau_bo *nvbo = nouveau_bo(bo);

	struct nvkm_vma *vma;

drivers/gpu/drm/qxl/qxl_ttm.c

+1 −0
Original line number Diff line number Diff line
@@ -366,6 +366,7 @@ static int qxl_bo_move(struct ttm_buffer_object *bo, 
}



static void qxl_bo_move_notify(struct ttm_buffer_object *bo,

			       bool evict,

			       struct ttm_mem_reg *new_mem)

{

	struct qxl_bo *qbo;

drivers/gpu/drm/radeon/radeon_object.c

+1 −0
Original line number Diff line number Diff line
@@ -765,6 +765,7 @@ int radeon_bo_check_tiling(struct radeon_bo *bo, bool has_moved, 
}



void radeon_bo_move_notify(struct ttm_buffer_object *bo,

			   bool evict,

			   struct ttm_mem_reg *new_mem)

{

	struct radeon_bo *rbo;

CRA Git | Maintained and supported by SUSTech CRA and CCSE