Quoting Sagar Arun Kamble (2018-04-05 12:54:38)
>
>
> On 4/5/2018 4:32 PM, Chris Wilson wrote:
> > As different backends may have different park/unpark callbacks, we
> > should only ever switch backends (reset_default_submission on wedge
> > recovery, or on enabling the guc) while parked.
> >
> > Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
> > Cc: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx>
> > Cc: Sagar Arun Kamble <sagar.a.kamble@xxxxxxxxx>
> > Cc: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
> > Cc: Mika Kuoppala <mika.kuoppala@xxxxxxxxxxxxxxx>
> > ---
> > drivers/gpu/drm/i915/i915_gem.c | 11 +++++++++++
> > drivers/gpu/drm/i915/intel_engine_cs.c | 3 +++
> > drivers/gpu/drm/i915/intel_guc_submission.c | 1 +
> > 3 files changed, 15 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> > index e148db310ea6..e2880de2fc7e 100644
> > --- a/drivers/gpu/drm/i915/i915_gem.c
> > +++ b/drivers/gpu/drm/i915/i915_gem.c
> > @@ -3380,6 +3380,17 @@ bool i915_gem_unset_wedged(struct drm_i915_private *i915)
> > i915_retire_requests(i915);
> > GEM_BUG_ON(i915->gt.active_requests);
> >
> > + /*
> > + * Park before disengaging the old submit mechanism as different
> > + * backends may have different park/unpack callbacks.
> > + *
> > + * We are idle; the idle-worker will be queued, but we need to run
> > + * it now. As we already hold the struct mutex, we can get park
> > + * the GPU right away, letting the lazy worker see that we are
> > + * already active again by the time it acquires the mutex.
> > + */
> > + i915_gem_park(i915);
> I think we should be calling this before gem_unset_wedged in i915_reset.
> With GuC, hitting the GEM_BUG_ON(awake) in guc_submission_enable.
Right, we really do need to restore guc submission before restarting. So
how can we fit in something like
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 9650a7b10c5f..95fa30d9aec6 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3132,6 +3132,9 @@ void i915_gem_reset(struct drm_i915_private *dev_priv)
i915_retire_requests(dev_priv);
+ if (USES_GUC_SUBMISSION(dev_priv))
+ (void)intel_guc_submission_enable(guc);
+
for_each_engine(engine, dev_priv, id) {
struct i915_gem_context *ctx;
?
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
