As a final paranoid step (we _should_ have reset the GPU on suspending
the device prior to unload), reset the GPU once more before removing the
powercontext and other related power saving paraphernalia.
A clue that this may not be the case is
<7> [313.203721] __intel_gt_set_wedged rcs'0
<7> [313.203746] __intel_gt_set_wedged Awake? 3
<7> [313.203751] __intel_gt_set_wedged Barriers?: no
<7> [313.203756] __intel_gt_set_wedged Latency: 0us
<7> [313.203762] __intel_gt_set_wedged Reset count: 0 (global 0)
<7> [313.203766] __intel_gt_set_wedged Requests:
<7> [313.203785] __intel_gt_set_wedged MMIO base: 0x00002000
<7> [313.203819] __intel_gt_set_wedged RING_START: 0x00000000
<7> [313.203826] __intel_gt_set_wedged RING_HEAD: 0x00000000
<7> [313.203833] __intel_gt_set_wedged RING_TAIL: 0x00000000
<7> [313.203844] __intel_gt_set_wedged RING_CTL: 0x00000000
<7> [313.203854] __intel_gt_set_wedged RING_MODE: 0x00000000
<7> [313.203861] __intel_gt_set_wedged RING_IMR: fffffefe
<7> [313.203875] __intel_gt_set_wedged ACTHD: 0x00000000_00000000
<7> [313.203888] __intel_gt_set_wedged BBADDR: 0x00000000_00000000
<7> [313.203901] __intel_gt_set_wedged DMA_FADDR: 0x00000000_00000000
<7> [313.203909] __intel_gt_set_wedged IPEIR: 0x00000000
<7> [313.203916] __intel_gt_set_wedged IPEHR: 0xcccccccc
<7> [313.203921] __intel_gt_set_wedged Execlist tasklet queued? no (enabled), preempt? inactive, timeslice? inactive
<7> [313.203932] __intel_gt_set_wedged Execlist status: 0x00044032 00000020; CSB read:5, write:0, entries:6
<7> [313.203937] __intel_gt_set_wedged Execlist CSB[0]: 0x00000001, context: 0
<7> [313.203952] __intel_gt_set_wedged Pending[0] ring:{start:000c4000, hwsp:fedfc000, seqno:00000000}, rq: 402e:2- prio=2147483647 @ 207ms: [i915]
<7> [313.203983] __intel_gt_set_wedged E 402e:2- prio=2147483647 @ 207ms: [i915]
<7> [313.204006] __intel_gt_set_wedged Queue priority hint: 3
during rapid fault-injection reloads. 0xcc is POISON_FREE_INIT which
suggests that the system cleared the pages on initialisation as they are
still being used from the previous module load.
Despite that we also have a couple of GPU resets prior to this...
I have a sneaky suspicion that may be a GuC artifact.
v2: Just set the device as wedged (which includes a reset) on
suspend/unload, and leave the sanitization to load/resume.
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Cc: Andi Shyti <andi.shyti@xxxxxxxxx>
Cc: Mika Kuoppala <mika.kuoppala@xxxxxxxxxxxxxxx>
---
drivers/gpu/drm/i915/gt/intel_gt.c | 3 +-
drivers/gpu/drm/i915/gt/intel_gt_pm.c | 60 ++++++++++-----------------
drivers/gpu/drm/i915/gt/intel_reset.c | 2 +
3 files changed, 26 insertions(+), 39 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c
index da2b6e2ae692..700ee4c37487 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt.c
@@ -588,7 +588,7 @@ int intel_gt_init(struct intel_gt *gt)
err = intel_gt_resume(gt);
if (err)
- goto err_uc_init;
+ goto err_gt;
err = __engines_record_defaults(gt);
if (err)
@@ -606,7 +606,6 @@ int intel_gt_init(struct intel_gt *gt)
err_gt:
__intel_gt_disable(gt);
intel_uc_fini_hw(>->uc);
-err_uc_init:
intel_uc_fini(>->uc);
err_engines:
intel_engines_release(gt);
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
index d1c2f034296a..681cd986324f 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
@@ -118,36 +118,16 @@ void intel_gt_pm_init(struct intel_gt *gt)
intel_rps_init(>->rps);
}
-static bool reset_engines(struct intel_gt *gt)
+static void reset_engines(struct intel_gt *gt)
{
- if (INTEL_INFO(gt->i915)->gpu_reset_clobbers_display)
- return false;
-
- return __intel_gt_reset(gt, ALL_ENGINES) == 0;
+ if (!INTEL_INFO(gt->i915)->gpu_reset_clobbers_display)
+ __intel_gt_reset(gt, ALL_ENGINES);
}
-static void gt_sanitize(struct intel_gt *gt, bool force)
+static void gt_sanitize(struct intel_gt *gt)
{
struct intel_engine_cs *engine;
enum intel_engine_id id;
- intel_wakeref_t wakeref;
-
- GT_TRACE(gt, "force:%s", yesno(force));
-
- /* Use a raw wakeref to avoid calling intel_display_power_get early */
- wakeref = intel_runtime_pm_get(gt->uncore->rpm);
- intel_uncore_forcewake_get(gt->uncore, FORCEWAKE_ALL);
-
- /*
- * As we have just resumed the machine and woken the device up from
- * deep PCI sleep (presumably D3_cold), assume the HW has been reset
- * back to defaults, recovering from whatever wedged state we left it
- * in and so worth trying to use the device once more.
- */
- if (intel_gt_is_wedged(gt))
- intel_gt_unset_wedged(gt);
-
- intel_uc_sanitize(>->uc);
for_each_engine(engine, gt, id)
if (engine->reset.prepare)
@@ -155,21 +135,18 @@ static void gt_sanitize(struct intel_gt *gt, bool force)
intel_uc_reset_prepare(>->uc);
- if (reset_engines(gt) || force) {
- for_each_engine(engine, gt, id)
- __intel_engine_reset(engine, false);
- }
+ reset_engines(gt);
+ for_each_engine(engine, gt, id)
+ __intel_engine_reset(engine, false);
for_each_engine(engine, gt, id)
if (engine->reset.finish)
engine->reset.finish(engine);
-
- intel_uncore_forcewake_put(gt->uncore, FORCEWAKE_ALL);
- intel_runtime_pm_put(gt->uncore->rpm, wakeref);
}
void intel_gt_pm_fini(struct intel_gt *gt)
{
+ intel_gt_set_wedged(gt);
intel_rc6_fini(>->rc6);
}
@@ -192,15 +169,25 @@ int intel_gt_resume(struct intel_gt *gt)
* allowing us to fixup the user contexts on their first pin.
*/
intel_gt_pm_get(gt);
-
intel_uncore_forcewake_get(gt->uncore, FORCEWAKE_ALL);
- intel_rc6_sanitize(>->rc6);
- gt_sanitize(gt, true);
- if (intel_gt_is_wedged(gt)) {
+
+ /*
+ * As we have just resumed the machine and woken the device up from
+ * deep PCI sleep (presumably D3_cold), assume the HW has been reset
+ * back to defaults, recovering from whatever wedged state we left it
+ * in and so worth trying to use the device once more.
+ */
+ if (intel_gt_is_wedged(gt))
+ intel_gt_unset_wedged(gt);
+ if (unlikely(intel_gt_is_wedged(gt))) {
err = -EIO;
goto out_fw;
}
+ intel_rc6_sanitize(>->rc6);
+ intel_uc_sanitize(>->uc);
+ gt_sanitize(gt);
+
/* Only when the HW is re-initialised, can we replay the requests */
err = intel_gt_init_hw(gt);
if (err) {
@@ -308,8 +295,7 @@ void intel_gt_suspend_late(struct intel_gt *gt)
intel_llc_disable(>->llc);
}
- gt_sanitize(gt, false);
-
+ intel_gt_set_wedged(gt);
GT_TRACE(gt, "\n");
}
diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
index beee0cf89bce..234663faf4c2 100644
--- a/drivers/gpu/drm/i915/gt/intel_reset.c
+++ b/drivers/gpu/drm/i915/gt/intel_reset.c
@@ -768,6 +768,8 @@ static void reset_finish(struct intel_gt *gt, intel_engine_mask_t awake)
struct intel_engine_cs *engine;
enum intel_engine_id id;
+ intel_uc_sanitize(>->uc);
+
for_each_engine(engine, gt, id) {
reset_finish_engine(engine);
if (awake & engine->mask)
--
2.25.0.rc2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
