]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/i915: Verify power domains state during suspend in all cases
authorImre Deak <imre.deak@intel.com>
Thu, 9 May 2019 17:34:38 +0000 (20:34 +0300)
committerImre Deak <imre.deak@intel.com>
Tue, 14 May 2019 10:56:11 +0000 (13:56 +0300)
There is no reason why we couldn't verify the power domains state during
suspend in all cases, so do that. I overlooked this when originally
adding the check.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190509173446.31095-4-imre.deak@intel.com
drivers/gpu/drm/i915/intel_runtime_pm.c

index 18152978375a03d942d7bd2d7dff841800ae45a3..2cf4943df2e75d2db45bf0697e8a79e675d63e28 100644 (file)
@@ -4528,10 +4528,10 @@ void intel_power_domains_suspend(struct drm_i915_private *i915,
         * Even if power well support was disabled we still want to disable
         * power wells if power domains must be deinitialized for suspend.
         */
-       if (!i915_modparams.disable_power_well) {
+       if (!i915_modparams.disable_power_well)
                intel_display_power_put_unchecked(i915, POWER_DOMAIN_INIT);
-               intel_power_domains_verify_state(i915);
-       }
+
+       intel_power_domains_verify_state(i915);
 
        if (INTEL_GEN(i915) >= 11)
                icl_display_core_uninit(i915);