Commit 057fe353 authored by Chris Wilson's avatar Chris Wilson Committed by Jani Nikula
Browse files

drm/i915: Disable RPM wakeref assertions during driver shutdown 



As with the regular suspend paths, also disable the wakeref assertions
as we disable the driver during shutdown.

Reported-by: default avatarHans de Goede <hdegoede@redhat.com>
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/2899


Fixes: fe0f1e3b ("drm/i915: Shut down displays gracefully on reboot")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Tested-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210104203905.19248-1-chris@chris-wilson.co.uk


(cherry picked from commit 19fe4ac6)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 00cb645f

drivers/gpu/drm/i915/i915_drv.c

+4 −0
Original line number Diff line number Diff line
@@ -1047,6 +1047,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);
@@ -1060,6 +1062,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)