Commit a78a8da5 authored by Somalapuram Amaranath's avatar Somalapuram Amaranath Committed by Christian König
Browse files

drm/ttm: replace busy placement with flags v6 



Instead of a list of separate busy placement add flags which indicate
that a placement should only be used when there is room or if we need to
evict.

v2: add missing TTM_PL_FLAG_IDLE for i915
v3: fix auto build test ERROR on drm-tip/drm-tip
v4: fix some typos pointed out by checkpatch
v5: cleanup some rebase problems with VMWGFX
v6: implement some missing VMWGFX functionality pointed out by Zack,
    rename the flags as suggested by Michel, rebase on drm-tip and
    adjust XE as well

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarSomalapuram Amaranath <Amaranath.Somalapuram@amd.com>
Reviewed-by: default avatarZack Rusin <zack.rusin@broadcom.com>
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240112125158.2748-4-christian.koenig@amd.com
parent 28e51267

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

+1 −5
Original line number Diff line number Diff line
@@ -220,9 +220,6 @@ void amdgpu_bo_placement_from_domain(struct amdgpu_bo *abo, u32 domain) 


	placement->num_placement = c;

	placement->placement = places;



	placement->num_busy_placement = c;

	placement->busy_placement = places;

}



/**
@@ -1406,8 +1403,7 @@ vm_fault_t amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo) 
					AMDGPU_GEM_DOMAIN_GTT);



	/* Avoid costly evictions; only set GTT as a busy placement */

	abo->placement.num_busy_placement = 1;

	abo->placement.busy_placement = &abo->placements[1];

	abo->placements[0].flags |= TTM_PL_FLAG_DESIRED;



	r = ttm_bo_validate(bo, &abo->placement, &ctx);

	if (unlikely(r == -EBUSY || r == -ERESTARTSYS))

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

+2 −9
Original line number Diff line number Diff line
@@ -102,23 +102,19 @@ static void amdgpu_evict_flags(struct ttm_buffer_object *bo, 
	/* Don't handle scatter gather BOs */

	if (bo->type == ttm_bo_type_sg) {

		placement->num_placement = 0;

		placement->num_busy_placement = 0;

		return;

	}



	/* Object isn't an AMDGPU object so ignore */

	if (!amdgpu_bo_is_amdgpu_bo(bo)) {

		placement->placement = &placements;

		placement->busy_placement = &placements;

		placement->num_placement = 1;

		placement->num_busy_placement = 1;

		return;

	}



	abo = ttm_to_amdgpu_bo(bo);

	if (abo->flags & AMDGPU_GEM_CREATE_DISCARDABLE) {

		placement->num_placement = 0;

		placement->num_busy_placement = 0;

		return;

	}
@@ -128,13 +124,13 @@ static void amdgpu_evict_flags(struct ttm_buffer_object *bo, 
	case AMDGPU_PL_OA:

	case AMDGPU_PL_DOORBELL:

		placement->num_placement = 0;

		placement->num_busy_placement = 0;

		return;



	case TTM_PL_VRAM:

		if (!adev->mman.buffer_funcs_enabled) {

			/* Move to system memory */

			amdgpu_bo_placement_from_domain(abo, AMDGPU_GEM_DOMAIN_CPU);



		} else if (!amdgpu_gmc_vram_full_visible(&adev->gmc) &&

			   !(abo->flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) &&

			   amdgpu_bo_in_cpu_visible_vram(abo)) {
@@ -149,8 +145,7 @@ static void amdgpu_evict_flags(struct ttm_buffer_object *bo, 
							AMDGPU_GEM_DOMAIN_CPU);

			abo->placements[0].fpfn = adev->gmc.visible_vram_size >> PAGE_SHIFT;

			abo->placements[0].lpfn = 0;

			abo->placement.busy_placement = &abo->placements[1];

			abo->placement.num_busy_placement = 1;

			abo->placements[0].flags |= TTM_PL_FLAG_DESIRED;

		} else {

			/* Move to GTT memory */

			amdgpu_bo_placement_from_domain(abo, AMDGPU_GEM_DOMAIN_GTT |
@@ -967,8 +962,6 @@ int amdgpu_ttm_alloc_gart(struct ttm_buffer_object *bo) 
	/* allocate GART space */

	placement.num_placement = 1;

	placement.placement = &placements;

	placement.num_busy_placement = 1;

	placement.busy_placement = &placements;

	placements.fpfn = 0;

	placements.lpfn = adev->gmc.gart_size >> PAGE_SHIFT;

	placements.mem_type = TTM_PL_TT;

drivers/gpu/drm/drm_gem_vram_helper.c

+0 −2
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ static void drm_gem_vram_placement(struct drm_gem_vram_object *gbo, 
		invariant_flags = TTM_PL_FLAG_TOPDOWN;



	gbo->placement.placement = gbo->placements;

	gbo->placement.busy_placement = gbo->placements;



	if (pl_flag & DRM_GEM_VRAM_PL_FLAG_VRAM) {

		gbo->placements[c].mem_type = TTM_PL_VRAM;
@@ -160,7 +159,6 @@ static void drm_gem_vram_placement(struct drm_gem_vram_object *gbo, 
	}



	gbo->placement.num_placement = c;

	gbo->placement.num_busy_placement = c;



	for (i = 0; i < c; ++i) {

		gbo->placements[i].fpfn = 0;

drivers/gpu/drm/i915/gem/i915_gem_ttm.c

+15 −22
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ static const struct ttm_place sys_placement_flags = { 
static struct ttm_placement i915_sys_placement = {

	.num_placement = 1,

	.placement = &sys_placement_flags,

	.num_busy_placement = 1,

	.busy_placement = &sys_placement_flags,

};



/**
@@ -157,32 +155,28 @@ i915_ttm_place_from_region(const struct intel_memory_region *mr, 


static void

i915_ttm_placement_from_obj(const struct drm_i915_gem_object *obj,

			    struct ttm_place *requested,

			    struct ttm_place *busy,

			    struct ttm_place *places,

			    struct ttm_placement *placement)

{

	unsigned int num_allowed = obj->mm.n_placements;

	unsigned int flags = obj->flags;

	unsigned int i;



	placement->num_placement = 1;

	places[0].flags |= TTM_PL_FLAG_DESIRED;

	i915_ttm_place_from_region(num_allowed ? obj->mm.placements[0] :

				   obj->mm.region, requested, obj->bo_offset,

				   obj->mm.region, &places[0], obj->bo_offset,

				   obj->base.size, flags);



	/* Cache this on object? */

	placement->num_busy_placement = num_allowed;

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

		i915_ttm_place_from_region(obj->mm.placements[i], busy + i,

					   obj->bo_offset, obj->base.size, flags);



	if (num_allowed == 0) {

		*busy = *requested;

		placement->num_busy_placement = 1;

	for (i = 0; i < num_allowed; ++i) {

		i915_ttm_place_from_region(obj->mm.placements[i],

					   &places[i + 1], obj->bo_offset,

					   obj->base.size, flags);

		places[i + 1].flags |= TTM_PL_FLAG_FALLBACK;

	}



	placement->placement = requested;

	placement->busy_placement = busy;

	placement->num_placement = num_allowed + 1;

	placement->placement = places;

}



static int i915_ttm_tt_shmem_populate(struct ttm_device *bdev,
@@ -789,7 +783,8 @@ static int __i915_ttm_get_pages(struct drm_i915_gem_object *obj, 
	int ret;



	/* First try only the requested placement. No eviction. */

	real_num_busy = fetch_and_zero(&placement->num_busy_placement);

	real_num_busy = placement->num_placement;

	placement->num_placement = 1;

	ret = ttm_bo_validate(bo, placement, &ctx);

	if (ret) {

		ret = i915_ttm_err_to_gem(ret);
@@ -805,7 +800,7 @@ static int __i915_ttm_get_pages(struct drm_i915_gem_object *obj, 
		 * If the initial attempt fails, allow all accepted placements,

		 * evicting if necessary.

		 */

		placement->num_busy_placement = real_num_busy;

		placement->num_placement = real_num_busy;

		ret = ttm_bo_validate(bo, placement, &ctx);

		if (ret)

			return i915_ttm_err_to_gem(ret);
@@ -839,7 +834,7 @@ static int __i915_ttm_get_pages(struct drm_i915_gem_object *obj, 


static int i915_ttm_get_pages(struct drm_i915_gem_object *obj)

{

	struct ttm_place requested, busy[I915_TTM_MAX_PLACEMENTS];

	struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];

	struct ttm_placement placement;



	/* restricted by sg_alloc_table */
@@ -849,7 +844,7 @@ static int i915_ttm_get_pages(struct drm_i915_gem_object *obj) 
	GEM_BUG_ON(obj->mm.n_placements > I915_TTM_MAX_PLACEMENTS);



	/* Move to the requested placement. */

	i915_ttm_placement_from_obj(obj, &requested, busy, &placement);

	i915_ttm_placement_from_obj(obj, places, &placement);



	return __i915_ttm_get_pages(obj, &placement);

}
@@ -879,9 +874,7 @@ static int __i915_ttm_migrate(struct drm_i915_gem_object *obj, 
	i915_ttm_place_from_region(mr, &requested, obj->bo_offset,

				   obj->base.size, flags);

	placement.num_placement = 1;

	placement.num_busy_placement = 1;

	placement.placement = &requested;

	placement.busy_placement = &requested;



	ret = __i915_ttm_get_pages(obj, &placement);

	if (ret)

drivers/gpu/drm/loongson/lsdc_ttm.c

+0 −2
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ static void lsdc_bo_set_placement(struct lsdc_bo *lbo, u32 domain) 
		pflags |= TTM_PL_FLAG_TOPDOWN;



	lbo->placement.placement = lbo->placements;

	lbo->placement.busy_placement = lbo->placements;



	if (domain & LSDC_GEM_DOMAIN_VRAM) {

		lbo->placements[c].mem_type = TTM_PL_VRAM;
@@ -77,7 +76,6 @@ static void lsdc_bo_set_placement(struct lsdc_bo *lbo, u32 domain) 
	}



	lbo->placement.num_placement = c;

	lbo->placement.num_busy_placement = c;



	for (i = 0; i < c; ++i) {

		lbo->placements[i].fpfn = 0;