@@ -136,11 +136,18 @@ void intel_gt_sanitize(struct intel_gt *gt, bool force)
intel_uc_sanitize(>->uc);
- if (!reset_engines(gt) && !force)
- return;
+ for_each_engine(engine, gt->i915, id)
+ if (engine->reset.prepare)
+ engine->reset.prepare(engine);
+
+ if (reset_engines(gt) || force) {
+ for_each_engine(engine, gt->i915, id)
+ __intel_engine_reset(engine, false);
+ }
for_each_engine(engine, gt->i915, id)
- __intel_engine_reset(engine, false);
+ if (engine->reset.finish)
+ engine->reset.finish(engine);
}
void intel_gt_pm_disable(struct intel_gt *gt)
@@ -1843,6 +1843,7 @@ static void process_csb(struct intel_engine_cs *engine)
u8 head, tail;
GEM_BUG_ON(USES_GUC_SUBMISSION(engine->i915));
+ GEM_BUG_ON(!tasklet_is_locked(&execlists->tasklet));
/*
* Note that csb_write, csb_status may be either in HWSP or mmio.
@@ -86,6 +86,11 @@ static inline void tasklet_lock(struct tasklet_struct *t)
cpu_relax();
}
+static inline bool tasklet_is_locked(const struct tasklet_struct *t)
+{
+ return test_bit(TASKLET_STATE_RUN, &t->state);
+}
+
static inline void __tasklet_disable_sync_once(struct tasklet_struct *t)
{
if (!atomic_fetch_inc(&t->count))