|
@@ -76,6 +76,14 @@ static void intel_power_well_enable(struct drm_i915_private *dev_priv,
|
|
power_well->hw_enabled = true;
|
|
power_well->hw_enabled = true;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+static void intel_power_well_disable(struct drm_i915_private *dev_priv,
|
|
|
|
+ struct i915_power_well *power_well)
|
|
|
|
+{
|
|
|
|
+ DRM_DEBUG_KMS("disabling %s\n", power_well->name);
|
|
|
|
+ power_well->hw_enabled = false;
|
|
|
|
+ power_well->ops->disable(dev_priv, power_well);
|
|
|
|
+}
|
|
|
|
+
|
|
/*
|
|
/*
|
|
* We should only use the power well if we explicitly asked the hardware to
|
|
* We should only use the power well if we explicitly asked the hardware to
|
|
* enable it, so check if it's enabled and also check if we've requested it to
|
|
* enable it, so check if it's enabled and also check if we've requested it to
|
|
@@ -1147,11 +1155,8 @@ void intel_display_power_put(struct drm_i915_private *dev_priv,
|
|
for_each_power_well_rev(i, power_well, BIT(domain), power_domains) {
|
|
for_each_power_well_rev(i, power_well, BIT(domain), power_domains) {
|
|
WARN_ON(!power_well->count);
|
|
WARN_ON(!power_well->count);
|
|
|
|
|
|
- if (!--power_well->count && i915.disable_power_well) {
|
|
|
|
- DRM_DEBUG_KMS("disabling %s\n", power_well->name);
|
|
|
|
- power_well->hw_enabled = false;
|
|
|
|
- power_well->ops->disable(dev_priv, power_well);
|
|
|
|
- }
|
|
|
|
|
|
+ if (!--power_well->count && i915.disable_power_well)
|
|
|
|
+ intel_power_well_disable(dev_priv, power_well);
|
|
}
|
|
}
|
|
|
|
|
|
mutex_unlock(&power_domains->lock);
|
|
mutex_unlock(&power_domains->lock);
|