diff options
| author | Imre Deak | 2016-04-18 09:04:19 +0200 |
|---|---|---|
| committer | Imre Deak | 2016-04-19 11:28:04 +0200 |
| commit | 6e35e8ab6f7058cf5a53b30bf0085e0eaf61b4f7 (patch) | |
| tree | e65d0f844d722d3a5e6e2cabf33e8897b0ae69da /drivers/gpu/drm/i915/i915_drv.c | |
| parent | drm/i915/kbl: Reset secondary power well requests left on by DMC/KVMR (diff) | |
| download | kernel-qcow2-linux-6e35e8ab6f7058cf5a53b30bf0085e0eaf61b4f7.tar.gz kernel-qcow2-linux-6e35e8ab6f7058cf5a53b30bf0085e0eaf61b4f7.tar.xz kernel-qcow2-linux-6e35e8ab6f7058cf5a53b30bf0085e0eaf61b4f7.zip | |
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: 1f814daca43a ("drm/i915: add support for checking if we hold an RPM reference")
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1460963062-13211-2-git-send-email-imre.deak@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index b7c7d7773654..219b70774b01 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -842,11 +842,11 @@ static int i915_drm_resume_early(struct drm_device *dev) !(dev_priv->suspended_to_idle && dev_priv->csr.dmc_payload)) intel_power_domains_init_hw(dev_priv, true); + enable_rpm_wakeref_asserts(dev_priv); + out: dev_priv->suspended_to_idle = false; - enable_rpm_wakeref_asserts(dev_priv); - return ret; } |