Commit 3b2de699 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: stop crashing on GDS/GWS/OA eviction 



Simply ignore any copying here.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0ee86853

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

+18 −0
Original line number Diff line number Diff line
@@ -256,6 +256,13 @@ static void amdgpu_evict_flags(struct ttm_buffer_object *bo, 


	abo = ttm_to_amdgpu_bo(bo);

	switch (bo->mem.mem_type) {

	case AMDGPU_PL_GDS:

	case AMDGPU_PL_GWS:

	case AMDGPU_PL_OA:

		placement->num_placement = 0;

		placement->num_busy_placement = 0;

		return;



	case TTM_PL_VRAM:

		if (!adev->mman.buffer_funcs_enabled) {

			/* Move to system memory */
@@ -283,6 +290,7 @@ static void amdgpu_evict_flags(struct ttm_buffer_object *bo, 
	case TTM_PL_TT:

	default:

		amdgpu_bo_placement_from_domain(abo, AMDGPU_GEM_DOMAIN_CPU);

		break;

	}

	*placement = abo->placement;

}
@@ -675,6 +683,16 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict, 
		amdgpu_move_null(bo, new_mem);

		return 0;

	}

	if (old_mem->mem_type == AMDGPU_PL_GDS ||

	    old_mem->mem_type == AMDGPU_PL_GWS ||

	    old_mem->mem_type == AMDGPU_PL_OA ||

	    new_mem->mem_type == AMDGPU_PL_GDS ||

	    new_mem->mem_type == AMDGPU_PL_GWS ||

	    new_mem->mem_type == AMDGPU_PL_OA) {

		/* Nothing to save here */

		amdgpu_move_null(bo, new_mem);

		return 0;

	}



	if (!adev->mman.buffer_funcs_enabled)

		goto memcpy;