Commit f3edf691 authored by Matthew Auld's avatar Matthew Auld Committed by Rodrigo Vivi
Browse files

drm/xe/bo: reduce xe_bo_create_pin_map() restrictions 



On DGFX this blows up if can call this with a system memory object:

XE_BUG_ON(!mem_type_is_vram(place->mem_type) && place->mem_type != XE_PL_STOLEN);

If we consider dpt it looks like we can already in theory hit this, if
we run out of vram and stolen vram. It at least seems reasonable to
allow calling this on any object which supports CPU access.

Note this also changes the behaviour with stolen VRAM and suspend, such
that we no longer attempt to migrate stolen objects into system memory.
However nothing in stolen should ever need to be restored (same on
integrated), so should be fine. Also on small-bar systems the stolen
portion is pretty much always non-CPU accessible, and currently pinned
objects use plain memcpy when being moved, which doesn't play nicely.

Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 9b6483af

drivers/gpu/drm/xe/xe_bo.c

+20 −15
Original line number Diff line number Diff line
@@ -1290,17 +1290,17 @@ int xe_bo_pin(struct xe_bo *bo) 
		return err;



	/*

	 * For pinned objects in on DGFX, we expect these objects to be in

	 * contiguous VRAM memory. Required eviction / restore during suspend /

	 * resume (force restore to same physical address).

	 * For pinned objects in on DGFX, which are also in vram, we expect

	 * these to be in contiguous VRAM memory. Required eviction / restore

	 * during suspend / resume (force restore to same physical address).

	 */

	if (IS_DGFX(xe) && !(IS_ENABLED(CONFIG_DRM_XE_DEBUG) &&

	    bo->flags & XE_BO_INTERNAL_TEST)) {

		struct ttm_place *place = &(bo->placements[0]);

		bool lmem;



		if (mem_type_is_vram(place->mem_type)) {

			XE_BUG_ON(!(place->flags & TTM_PL_FLAG_CONTIGUOUS));

		XE_BUG_ON(!mem_type_is_vram(place->mem_type) && place->mem_type != XE_PL_STOLEN);



			place->fpfn = (xe_bo_addr(bo, 0, PAGE_SIZE, &lmem) -

				       vram_region_io_offset(bo)) >> PAGE_SHIFT;
@@ -1310,6 +1310,7 @@ int xe_bo_pin(struct xe_bo *bo) 
			list_add_tail(&bo->pinned_link, &xe->pinned.kernel_bo_present);

			spin_unlock(&xe->pinned.lock);

		}

	}



	ttm_bo_pin(&bo->ttm);
@@ -1364,12 +1365,16 @@ void xe_bo_unpin(struct xe_bo *bo) 


	if (IS_DGFX(xe) && !(IS_ENABLED(CONFIG_DRM_XE_DEBUG) &&

	    bo->flags & XE_BO_INTERNAL_TEST)) {

		struct ttm_place *place = &(bo->placements[0]);



		if (mem_type_is_vram(place->mem_type)) {

			XE_BUG_ON(list_empty(&bo->pinned_link));



			spin_lock(&xe->pinned.lock);

			list_del_init(&bo->pinned_link);

			spin_unlock(&xe->pinned.lock);

		}

	}



	ttm_bo_unpin(&bo->ttm);

}