Commit 661a7606 authored Dec 15, 2016 by Nicolai Hähnle Committed by Alex Deucher Jan 27, 2017

drm/amd/amdgpu: move eviction counting to amdgpu_bo_move_notify



This catches evictions of shadow page tables from the GART. Since shadow
page tables are always stored in system memory, amdgpu_bo_move is never
called for them.

This fixes a crash during command submission that occurs when only a shadow
page table and no other BOs were evicted since the last submission.

Fixes: 1baa439f ("drm/amdgpu: allocate shadow for pd/pt bo V2")
Signed-off-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 66257db7

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -862,6 +862,10 @@ void amdgpu_bo_move_notify(struct ttm_buffer_object *bo,
		abo = container_of(bo, struct amdgpu_bo, tbo);
		amdgpu_vm_bo_invalidate(adev, abo);

		/* remember the eviction */
		if (evict)
		atomic64_inc(&adev->num_evictions);

		/* update statistics */
		if (!new_mem)
		return;

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -466,10 +466,6 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo,

		adev = amdgpu_ttm_adev(bo->bdev);

		/* remember the eviction */
		if (evict)
		atomic64_inc(&adev->num_evictions);

		if (old_mem->mem_type == TTM_PL_SYSTEM && bo->ttm == NULL) {
		amdgpu_move_null(bo, new_mem);
		return 0;

Admin message