Hi, On 1/4/21 9:39 PM, Chris Wilson wrote: > As with the regular suspend paths, also disable the wakeref assertions > as we disable the driver during shutdown. > > Reported-by: Hans de Goede <hdegoede@xxxxxxxxxx> > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/2899 > Fixes: fe0f1e3bfdfe ("drm/i915: Shut down displays gracefully on reboot") > Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > Cc: Hans de Goede <hdegoede@xxxxxxxxxx> Thanks, I can confirm that this patch fixes the warn/backtrace on shutdown/reboot: Tested-by: Hans de Goede <hdegoede@xxxxxxxxxx> Regards, Hans > --- > drivers/gpu/drm/i915/i915_drv.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 249f765993f7..643a899b3b44 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -1046,6 +1046,8 @@ static void intel_shutdown_encoders(struct drm_i915_private *dev_priv) > > void i915_driver_shutdown(struct drm_i915_private *i915) > { > + disable_rpm_wakeref_asserts(&i915->runtime_pm); > + > i915_gem_suspend(i915); > > drm_kms_helper_poll_disable(&i915->drm); > @@ -1059,6 +1061,8 @@ void i915_driver_shutdown(struct drm_i915_private *i915) > > intel_suspend_encoders(i915); > intel_shutdown_encoders(i915); > + > + enable_rpm_wakeref_asserts(&i915->runtime_pm); > } > > static bool suspend_to_idle(struct drm_i915_private *dev_priv) > _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
