Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/ttm: remove manual placement preference 



If drivers don't prefer a system memory placement
they should not but it into the placement list first.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarChunming Zhou <david1.zhou@amd.com>
Tested-by: default avatarPierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b2f7a616

drivers/gpu/drm/ttm/ttm_bo.c

+9 −9
Original line number Diff line number Diff line
@@ -1012,8 +1012,12 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo, 
		ttm_flag_masked(&cur_flags, place->flags,

				~TTM_PL_MASK_MEMTYPE);



		if (mem_type == TTM_PL_SYSTEM)

			break;

		if (mem_type == TTM_PL_SYSTEM) {

			mem->mem_type = mem_type;

			mem->placement = cur_flags;

			mem->mm_node = NULL;

			return 0;

		}



		ret = (*man->func->get_node)(man, bo, place, mem);

		if (unlikely(ret))
@@ -1025,15 +1029,11 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo, 
				(*man->func->put_node)(man, mem);

				return ret;

			}

			break;

		}

	}



	if ((type_ok && (mem_type == TTM_PL_SYSTEM)) || mem->mm_node) {

			mem->mem_type = mem_type;

			mem->placement = cur_flags;

			return 0;

		}

	}



	for (i = 0; i < placement->num_busy_placement; ++i) {

		const struct ttm_place *place = &placement->busy_placement[i];