[Intel-gfx] [PATCH v2 06/26] drm/i915: Add function to call a power well's sync_hw() hook

[Imre Deak]

Add a function to call a power well's sync_hw() hook, instead of
open-coding the same, as a step towards making the low-level
power well internals (i915_power_well_ops/desc structs) hidden.

The cached-enable state should be always up-to-date, so update it
whenever sync_hw() is called.

No functional change.

Suggested-by: Jani Nikula <jani.nik...@intel.com>
Cc: Jani Nikula <jani.nik...@intel.com>
Signed-off-by: Imre Deak <imre.d...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display_power.c      | 7 ++-----
 drivers/gpu/drm/i915/display/intel_display_power_well.c | 8 ++++++++
 drivers/gpu/drm/i915/display/intel_display_power_well.h | 2 ++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c 
b/drivers/gpu/drm/i915/display/intel_display_power.c
index 3b8b745f1729f..056965248a3b2 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power.c
@@ -5015,11 +5015,8 @@ static void intel_power_domains_sync_hw(struct 
drm_i915_private *dev_priv)
        struct i915_power_well *power_well;
 
        mutex_lock(&power_domains->lock);
-       for_each_power_well(dev_priv, power_well) {
-               power_well->desc->ops->sync_hw(dev_priv, power_well);
-               power_well->hw_enabled =
-                       power_well->desc->ops->is_enabled(dev_priv, power_well);
-       }
+       for_each_power_well(dev_priv, power_well)
+               intel_power_well_sync_hw(dev_priv, power_well);
        mutex_unlock(&power_domains->lock);
 }
 
diff --git a/drivers/gpu/drm/i915/display/intel_display_power_well.c 
b/drivers/gpu/drm/i915/display/intel_display_power_well.c
index e21190854fa0f..63b97bcc64bc3 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power_well.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power_well.c
@@ -22,6 +22,14 @@ void intel_power_well_disable(struct drm_i915_private *i915,
        power_well->desc->ops->disable(i915, power_well);
 }
 
+void intel_power_well_sync_hw(struct drm_i915_private *i915,
+                             struct i915_power_well *power_well)
+{
+       power_well->desc->ops->sync_hw(i915, power_well);
+       power_well->hw_enabled =
+               power_well->desc->ops->is_enabled(i915, power_well);
+}
+
 void intel_power_well_get(struct drm_i915_private *i915,
                          struct i915_power_well *power_well)
 {
diff --git a/drivers/gpu/drm/i915/display/intel_display_power_well.h 
b/drivers/gpu/drm/i915/display/intel_display_power_well.h
index bc77de3a8d4fc..ba5bbd36f7fc0 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power_well.h
+++ b/drivers/gpu/drm/i915/display/intel_display_power_well.h
@@ -107,6 +107,8 @@ void intel_power_well_enable(struct drm_i915_private *i915,
                             struct i915_power_well *power_well);
 void intel_power_well_disable(struct drm_i915_private *i915,
                              struct i915_power_well *power_well);
+void intel_power_well_sync_hw(struct drm_i915_private *i915,
+                             struct i915_power_well *power_well);
 void intel_power_well_get(struct drm_i915_private *i915,
                          struct i915_power_well *power_well);
 void intel_power_well_put(struct drm_i915_private *i915,
-- 
2.27.0