drm/i915: Fix mismatched INIT power domain disabling during suspend
authorImre Deak <imre.deak@intel.com>
Thu, 13 Oct 2016 11:34:06 +0000 (14:34 +0300)
committerJani Nikula <jani.nikula@intel.com>
Fri, 28 Oct 2016 12:19:43 +0000 (15:19 +0300)
commitfd58753ead86ee289ea89fe26e1842f36e54b36c
tree574532dffc9b5ec1bf0e2785c1b5b5b36d1d3ece
parentbe4dd651ff79b9fddc46ef330afeedc6560fd1ca
drm/i915: Fix mismatched INIT power domain disabling during suspend

Currently the display INIT power domain disabling/enabling happens in a
mismatched way in the suspend/resume_early hooks respectively. This can
leave display power wells incorrectly disabled in the resume hook if the
suspend sequence is aborted for some reason resulting in the
suspend/resume hooks getting called but the suspend_late/resume_early
hooks being skipped. In particular this change fixes "Unclaimed read
from register 0x1e1204" on BYT/BSW triggered from i915_drm_resume()->
intel_pps_unlock_regs_wa() when suspending with /sys/power/pm_test set
to devices.

Fixes: 85e90679335f ("drm/i915: disable power wells on suspend")
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: David Weinehall <david.weinehall@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1476358446-11621-1-git-send-email-imre.deak@intel.com
(cherry picked from commit 4c494a5769cd0de92638b25960ba0158c36088a6)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_drv.c