Commit 9a3f2107 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-xe-fixes-2025-09-11' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes 



- Don't touch survivability_mode on fini (Michal)
- Fixes around eviction and suspend (Thomas)
- Extend Wa_13011645652 to PTL-H, WCL (Julia)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://lore.kernel.org/r/aMLq7QlaEPHGKXKX@intel.com
parents dab1f855 fd99415e

drivers/gpu/drm/xe/tests/xe_bo.c

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static int evict_test_run_tile(struct xe_device *xe, struct xe_tile *tile, struc 
		}



		xe_bo_lock(external, false);

		err = xe_bo_pin_external(external);

		err = xe_bo_pin_external(external, false);

		xe_bo_unlock(external);

		if (err) {

			KUNIT_FAIL(test, "external bo pin err=%pe\n",

drivers/gpu/drm/xe/tests/xe_dma_buf.c

+1 −9
Original line number Diff line number Diff line
@@ -89,14 +89,6 @@ static void check_residency(struct kunit *test, struct xe_bo *exported, 
		return;

	}



	/*

	 * If on different devices, the exporter is kept in system  if

	 * possible, saving a migration step as the transfer is just

	 * likely as fast from system memory.

	 */

	if (params->mem_mask & XE_BO_FLAG_SYSTEM)

		KUNIT_EXPECT_TRUE(test, xe_bo_is_mem_type(exported, XE_PL_TT));

	else

	KUNIT_EXPECT_TRUE(test, xe_bo_is_mem_type(exported, mem_type));



	if (params->force_different_devices)

drivers/gpu/drm/xe/xe_bo.c

+12 −4
Original line number Diff line number Diff line
@@ -186,6 +186,8 @@ static void try_add_system(struct xe_device *xe, struct xe_bo *bo, 


		bo->placements[*c] = (struct ttm_place) {

			.mem_type = XE_PL_TT,

			.flags = (bo_flags & XE_BO_FLAG_VRAM_MASK) ?

			TTM_PL_FLAG_FALLBACK : 0,

		};

		*c += 1;

	}
@@ -2269,6 +2271,7 @@ uint64_t vram_region_gpu_offset(struct ttm_resource *res) 
/**

 * xe_bo_pin_external - pin an external BO

 * @bo: buffer object to be pinned

 * @in_place: Pin in current placement, don't attempt to migrate.

 *

 * Pin an external (not tied to a VM, can be exported via dma-buf / prime FD)

 * BO. Unique call compared to xe_bo_pin as this function has it own set of
@@ -2276,7 +2279,7 @@ uint64_t vram_region_gpu_offset(struct ttm_resource *res) 
 *

 * Returns 0 for success, negative error code otherwise.

 */

int xe_bo_pin_external(struct xe_bo *bo)

int xe_bo_pin_external(struct xe_bo *bo, bool in_place)

{

	struct xe_device *xe = xe_bo_device(bo);

	int err;
@@ -2285,9 +2288,11 @@ int xe_bo_pin_external(struct xe_bo *bo) 
	xe_assert(xe, xe_bo_is_user(bo));



	if (!xe_bo_is_pinned(bo)) {

		if (!in_place) {

			err = xe_bo_validate(bo, NULL, false);

			if (err)

				return err;

		}



		spin_lock(&xe->pinned.lock);

		list_add_tail(&bo->pinned_link, &xe->pinned.late.external);
@@ -2440,6 +2445,9 @@ int xe_bo_validate(struct xe_bo *bo, struct xe_vm *vm, bool allow_res_evict) 
	};

	int ret;



	if (xe_bo_is_pinned(bo))

		return 0;



	if (vm) {

		lockdep_assert_held(&vm->lock);

		xe_vm_assert_held(vm);

drivers/gpu/drm/xe/xe_bo.h

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static inline void xe_bo_unlock_vm_held(struct xe_bo *bo) 
	}

}



int xe_bo_pin_external(struct xe_bo *bo);

int xe_bo_pin_external(struct xe_bo *bo, bool in_place);

int xe_bo_pin(struct xe_bo *bo);

void xe_bo_unpin_external(struct xe_bo *bo);

void xe_bo_unpin(struct xe_bo *bo);

drivers/gpu/drm/xe/xe_device_types.h

+6 −0
Original line number Diff line number Diff line
@@ -553,6 +553,12 @@ struct xe_device { 


	/** @pm_notifier: Our PM notifier to perform actions in response to various PM events. */

	struct notifier_block pm_notifier;

	/** @pm_block: Completion to block validating tasks on suspend / hibernate prepare */

	struct completion pm_block;

	/** @rebind_resume_list: List of wq items to kick on resume. */

	struct list_head rebind_resume_list;

	/** @rebind_resume_lock: Lock to protect the rebind_resume_list */

	struct mutex rebind_resume_lock;



	/** @pmt: Support the PMT driver callback interface */

	struct {