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

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



Driver Changes:
- Add steering info support for GuC register lists (Jesus Narvaez)
- Add means to wait for reset and synchronous reset (Maciej)
- Make changing ccs_mode a synchronous action (Maciej)
- Add missing mux registers (Ashutosh)
- Mark ComputeCS read mode as UC on iGPU, unblocking ULLS on iGPU (Matt Brost)

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

From: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Z4ll3F1anLEwCvrf@fedora
parents cfaf51ad b1231ff7

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

+3 −4
Original line number Diff line number Diff line
@@ -257,10 +257,9 @@ static int evict_test_run_tile(struct xe_device *xe, struct xe_tile *tile, struc 
		 * however seems quite fragile not to also restart the GT. Try

		 * to do that here by triggering a GT reset.

		 */

		for_each_gt(__gt, xe, id) {

			xe_gt_reset_async(__gt);

			flush_work(&__gt->reset.worker);

		}

		for_each_gt(__gt, xe, id)

			xe_gt_reset(__gt);



		if (err) {

			KUNIT_FAIL(test, "restore kernel err=%pe\n",

				   ERR_PTR(err));

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

+1 −2
Original line number Diff line number Diff line
@@ -162,8 +162,7 @@ static int mocs_reset_test_run_device(struct xe_device *xe) 
		if (flags & HAS_LNCF_MOCS)

			read_l3cc_table(gt, &mocs.table);



		xe_gt_reset_async(gt);

		flush_work(&gt->reset.worker);

		xe_gt_reset(gt);



		kunit_info(test, "mocs_reset_test after reset\n");

		if (flags & HAS_GLOBAL_MOCS)

drivers/gpu/drm/xe/xe_gt.h

+25 −0
Original line number Diff line number Diff line
@@ -56,6 +56,31 @@ void xe_gt_sanitize(struct xe_gt *gt); 
int xe_gt_sanitize_freq(struct xe_gt *gt);

void xe_gt_remove(struct xe_gt *gt);



/**

 * xe_gt_wait_for_reset - wait for gt's async reset to finalize.

 * @gt: GT structure

 * Return:

 * %true if it waited for the work to finish execution,

 * %false if there was no scheduled reset or it was done.

 */

static inline bool xe_gt_wait_for_reset(struct xe_gt *gt)

{

	return flush_work(&gt->reset.worker);

}



/**

 * xe_gt_reset - perform synchronous reset

 * @gt: GT structure

 * Return:

 * %true if it waited for the reset to finish,

 * %false if there was no scheduled reset.

 */

static inline bool xe_gt_reset(struct xe_gt *gt)

{

	xe_gt_reset_async(gt);

	return xe_gt_wait_for_reset(gt);

}



/**

 * xe_gt_any_hw_engine_by_reset_domain - scan the list of engines and return the

 * first that matches the same reset domain as @class

drivers/gpu/drm/xe/xe_gt_ccs_mode.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ ccs_mode_store(struct device *kdev, struct device_attribute *attr, 
		xe_gt_info(gt, "Setting compute mode to %d\n", num_engines);

		gt->ccs_mode = num_engines;

		xe_gt_record_user_engines(gt);

		xe_gt_reset_async(gt);

		xe_gt_reset(gt);

	}



	mutex_unlock(&xe->drm.filelist_mutex);

drivers/gpu/drm/xe/xe_gt_debugfs.c

+1 −3
Original line number Diff line number Diff line
@@ -132,11 +132,9 @@ static int force_reset(struct xe_gt *gt, struct drm_printer *p) 
static int force_reset_sync(struct xe_gt *gt, struct drm_printer *p)

{

	xe_pm_runtime_get(gt_to_xe(gt));

	xe_gt_reset_async(gt);

	xe_gt_reset(gt);

	xe_pm_runtime_put(gt_to_xe(gt));



	flush_work(&gt->reset.worker);



	return 0;

}