Skip to content

Commit eed5b81

Browse files
cladurThomas Hellström
authored andcommitted
drm/xe: Restore engine registers before restarting schedulers after GT reset
During GT reset recovery in do_gt_restart(), xe_uc_start() was called before xe_reg_sr_apply_mmio() restored engine-specific registers. This created a race window where the scheduler could run jobs before hardware state was fully restored. This caused failures in eudebug tests (xe_exec_sip_eudebug@breakpoint- waitsip-*) where TD_CTL register (containing TD_CTL_GLOBAL_DEBUG_ENABLE) wasn't restored before jobs started executing. Breakpoints would fail to trigger SIP entry because the debug enable bit wasn't set yet. Fix by moving xe_uc_start() after all MMIO register restoration, including engine registers and CCS mode configuration, ensuring all hardware state is fully restored before any jobs can be scheduled. Fixes: dd08ebf ("drm/xe: Introduce a new DRM driver for Intel GPUs") Signed-off-by: Jan Maslak <jan.maslak@intel.com> Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com> Reviewed-by: Matthew Brost <matthew.brost@intel.com> Signed-off-by: Matthew Brost <matthew.brost@intel.com> Link: https://patch.msgid.link/20251210145618.169625-2-jan.maslak@intel.com (cherry picked from commit 825aed0) Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
1 parent eafb6f6 commit eed5b81

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

drivers/gpu/drm/xe/xe_gt.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -797,16 +797,17 @@ static int do_gt_restart(struct xe_gt *gt)
797797
xe_gt_sriov_pf_init_hw(gt);
798798

799799
xe_mocs_init(gt);
800-
err = xe_uc_start(&gt->uc);
801-
if (err)
802-
return err;
803800

804801
for_each_hw_engine(hwe, gt, id)
805802
xe_reg_sr_apply_mmio(&hwe->reg_sr, gt);
806803

807804
/* Get CCS mode in sync between sw/hw */
808805
xe_gt_apply_ccs_mode(gt);
809806

807+
err = xe_uc_start(&gt->uc);
808+
if (err)
809+
return err;
810+
810811
/* Restore GT freq to expected values */
811812
xe_gt_sanitize_freq(gt);
812813

0 commit comments

Comments
 (0)