Browse Source

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

Simply ignore any copying here.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Christian König 7 years ago
parent
commit
3b2de69944
1 changed files with 18 additions and 0 deletions
  1. 18 0
      drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+ 18 - 0
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

@@ -256,6 +256,13 @@ static void amdgpu_evict_flags(struct ttm_buffer_object *bo,
 
 
 	abo = ttm_to_amdgpu_bo(bo);
 	abo = ttm_to_amdgpu_bo(bo);
 	switch (bo->mem.mem_type) {
 	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:
 	case TTM_PL_VRAM:
 		if (!adev->mman.buffer_funcs_enabled) {
 		if (!adev->mman.buffer_funcs_enabled) {
 			/* Move to system memory */
 			/* Move to system memory */
@@ -283,6 +290,7 @@ static void amdgpu_evict_flags(struct ttm_buffer_object *bo,
 	case TTM_PL_TT:
 	case TTM_PL_TT:
 	default:
 	default:
 		amdgpu_bo_placement_from_domain(abo, AMDGPU_GEM_DOMAIN_CPU);
 		amdgpu_bo_placement_from_domain(abo, AMDGPU_GEM_DOMAIN_CPU);
+		break;
 	}
 	}
 	*placement = abo->placement;
 	*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);
 		amdgpu_move_null(bo, new_mem);
 		return 0;
 		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)
 	if (!adev->mman.buffer_funcs_enabled)
 		goto memcpy;
 		goto memcpy;