Commit 6e35e8ab authored by Imre Deak's avatar Imre Deak

drm/i915: Fix error path in i915_drm_resume_early

If system resume fails, this may lead to a runtime PM wake reference
underflow used for runtime PM state checking.

Fixes: 1f814dac ("drm/i915: add support for checking if we hold an RPM reference")
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1460963062-13211-2-git-send-email-imre.deak@intel.com
parent 5f304c87
...@@ -842,11 +842,11 @@ static int i915_drm_resume_early(struct drm_device *dev) ...@@ -842,11 +842,11 @@ static int i915_drm_resume_early(struct drm_device *dev)
!(dev_priv->suspended_to_idle && dev_priv->csr.dmc_payload)) !(dev_priv->suspended_to_idle && dev_priv->csr.dmc_payload))
intel_power_domains_init_hw(dev_priv, true); intel_power_domains_init_hw(dev_priv, true);
enable_rpm_wakeref_asserts(dev_priv);
out: out:
dev_priv->suspended_to_idle = false; dev_priv->suspended_to_idle = false;
enable_rpm_wakeref_asserts(dev_priv);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment