aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorImre Deak <imre.deak@intel.com>2013-10-29 19:09:50 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-10-31 17:26:45 +0100
commit1ad577ac6e2c870d6a68f214c9208882eb8d8f00 (patch)
treed035d86c08bdf11ff8c0a0db880ad314937291b8 /drivers
parent93d1f99734296699c3194a17be28cf5e32991199 (diff)
drm/i915: add back checking for i915_disable_power_well
In commit 6efdf354ddb186c6604d1692075421e8d2c740e9 Author: Imre Deak <imre.deak@intel.com> Date: Wed Oct 16 17:25:52 2013 +0300 the check for i915_disable_power_well flag was removed by overlook, so add it back now. Reported-by: Paulo Zanoni <paulo.zanoni@intel.com> Signed-off-by: Imre Deak <imre.deak@intel.com> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 222e47f1b53..97009ee387c 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -5592,7 +5592,7 @@ static void __intel_power_well_put(struct drm_device *dev,
struct i915_power_well *power_well)
{
WARN_ON(!power_well->count);
- if (!--power_well->count)
+ if (!--power_well->count && i915_disable_power_well)
__intel_set_power_well(dev, false);
}