From 1ad577ac6e2c870d6a68f214c9208882eb8d8f00 Mon Sep 17 00:00:00 2001 From: Imre Deak Date: Tue, 29 Oct 2013 19:09:50 +0200 Subject: [PATCH] drm/i915: add back checking for i915_disable_power_well In commit 6efdf354ddb186c6604d1692075421e8d2c740e9 Author: Imre Deak 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 Signed-off-by: Imre Deak Reviewed-by: Paulo Zanoni Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 222e47f1b538..97009ee387c1 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); } -- 2.20.1