aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_runtime_pm.c
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2015-07-30 17:20:26 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-08-05 04:20:39 -0400
commite8ca932056c22dfce2fac00058203386b41f3af4 (patch)
treeb9c49e9e81750f828232548c07ba6898386cdbf9 /drivers/gpu/drm/i915/intel_runtime_pm.c
parent0667405b6061be2949d841f05647e550d48c2765 (diff)
drm/i915: Extract a intel_power_well_enable() function
We need a bit book keeping around power wells' ops->enable(), namely a nice debug message and updating hw_enabled. Let's introduce a intel_power_well_enable() function to make sure all the callers do the same things. v2 (from Paulo): - s/i915_power_well_enable/intel_power_well_enable/ since everything else on this file uses intel_ instead of i915_. - Fix typo in commit message. Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_runtime_pm.c')
-rw-r--r--drivers/gpu/drm/i915/intel_runtime_pm.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 6393b76f87ff..a52574d4afbf 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -68,6 +68,14 @@
68bool intel_display_power_well_is_enabled(struct drm_i915_private *dev_priv, 68bool intel_display_power_well_is_enabled(struct drm_i915_private *dev_priv,
69 int power_well_id); 69 int power_well_id);
70 70
71static void intel_power_well_enable(struct drm_i915_private *dev_priv,
72 struct i915_power_well *power_well)
73{
74 DRM_DEBUG_KMS("enabling %s\n", power_well->name);
75 power_well->ops->enable(dev_priv, power_well);
76 power_well->hw_enabled = true;
77}
78
71/* 79/*
72 * We should only use the power well if we explicitly asked the hardware to 80 * We should only use the power well if we explicitly asked the hardware to
73 * enable it, so check if it's enabled and also check if we've requested it to 81 * enable it, so check if it's enabled and also check if we've requested it to
@@ -1104,11 +1112,8 @@ void intel_display_power_get(struct drm_i915_private *dev_priv,
1104 mutex_lock(&power_domains->lock); 1112 mutex_lock(&power_domains->lock);
1105 1113
1106 for_each_power_well(i, power_well, BIT(domain), power_domains) { 1114 for_each_power_well(i, power_well, BIT(domain), power_domains) {
1107 if (!power_well->count++) { 1115 if (!power_well->count++)
1108 DRM_DEBUG_KMS("enabling %s\n", power_well->name); 1116 intel_power_well_enable(dev_priv, power_well);
1109 power_well->ops->enable(dev_priv, power_well);
1110 power_well->hw_enabled = true;
1111 }
1112 } 1117 }
1113 1118
1114 power_domains->domain_use_count[domain]++; 1119 power_domains->domain_use_count[domain]++;