drm/i915/display: convert for_each_power_well() to struct intel_display

Start converting power well code to struct intel_display. Start off with
for_each_power_well() and the reverse variant.

Cc: Imre Deak <imre.deak@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/30c3e44cdb9557a195b2e086bf169da8d8497c6b.1732808222.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
index 59dee2dc05528e2882dd8696a71d28936e69227e..2e9d9f4d3ef82261819e5830f117817b7f0f92b2 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_power.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power.c
@@ -29,11 +29,11 @@
 #include "vlv_sideband.h"
 
 #define for_each_power_domain_well(__dev_priv, __power_well, __domain) \
-       for_each_power_well(__dev_priv, __power_well)                           \
+       for_each_power_well(&(__dev_priv)->display, __power_well)       \
                for_each_if(test_bit((__domain), (__power_well)->domains.bits))
 
 #define for_each_power_domain_well_reverse(__dev_priv, __power_well, __domain) \
-       for_each_power_well_reverse(__dev_priv, __power_well)                   \
+       for_each_power_well_reverse(&(__dev_priv)->display, __power_well) \
                for_each_if(test_bit((__domain), (__power_well)->domains.bits))
 
 static const char *
@@ -1028,11 +1028,12 @@ void intel_power_domains_cleanup(struct drm_i915_private *dev_priv)
 
 static void intel_power_domains_sync_hw(struct drm_i915_private *dev_priv)
 {
+       struct intel_display *display = &dev_priv->display;
        struct i915_power_domains *power_domains = &dev_priv->display.power.domains;
        struct i915_power_well *power_well;
 
        mutex_lock(&power_domains->lock);
-       for_each_power_well(dev_priv, power_well)
+       for_each_power_well(display, power_well)
                intel_power_well_sync_hw(dev_priv, power_well);
        mutex_unlock(&power_domains->lock);
 }
@@ -2003,12 +2004,13 @@ void intel_power_domains_driver_remove(struct drm_i915_private *i915)
  */
 void intel_power_domains_sanitize_state(struct drm_i915_private *i915)
 {
+       struct intel_display *display = &i915->display;
        struct i915_power_domains *power_domains = &i915->display.power.domains;
        struct i915_power_well *power_well;
 
        mutex_lock(&power_domains->lock);
 
-       for_each_power_well_reverse(i915, power_well) {
+       for_each_power_well_reverse(display, power_well) {
                if (power_well->desc->always_on || power_well->count ||
                    !intel_power_well_is_enabled(i915, power_well))
                        continue;
@@ -2146,10 +2148,11 @@ void intel_power_domains_resume(struct drm_i915_private *i915)
 
 static void intel_power_domains_dump_info(struct drm_i915_private *i915)
 {
+       struct intel_display *display = &i915->display;
        struct i915_power_domains *power_domains = &i915->display.power.domains;
        struct i915_power_well *power_well;
 
-       for_each_power_well(i915, power_well) {
+       for_each_power_well(display, power_well) {
                enum intel_display_power_domain domain;
 
                drm_dbg(&i915->drm, "%-25s %d\n",
@@ -2174,6 +2177,7 @@ static void intel_power_domains_dump_info(struct drm_i915_private *i915)
  */
 static void intel_power_domains_verify_state(struct drm_i915_private *i915)
 {
+       struct intel_display *display = &i915->display;
        struct i915_power_domains *power_domains = &i915->display.power.domains;
        struct i915_power_well *power_well;
        bool dump_domain_info;
@@ -2183,7 +2187,7 @@ static void intel_power_domains_verify_state(struct drm_i915_private *i915)
        verify_async_put_domains_state(power_domains);
 
        dump_domain_info = false;
-       for_each_power_well(i915, power_well) {
+       for_each_power_well(display, power_well) {
                enum intel_display_power_domain domain;
                int domains_count;
                bool enabled;

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 bdf6c690a03bf59869055fb61ddef49fcf9d3d52..11734951937aeca7f9962046f214a8dc052aac2f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_power_well.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power_well.c
@@ -76,9 +76,10 @@ struct i915_power_well *
 lookup_power_well(struct drm_i915_private *i915,
                  enum i915_power_well_id power_well_id)
 {
+       struct intel_display *display = &i915->display;
        struct i915_power_well *power_well;
 
-       for_each_power_well(i915, power_well)
+       for_each_power_well(display, power_well)
                if (i915_power_well_instance(power_well)->id == power_well_id)
                        return 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 93559f7c6100c3d60d97090bd5d3115255004d90..0c12ca46dfc8d114579c94bf1536f1e7e6b65855 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_power_well.h
+++ b/drivers/gpu/drm/i915/display/intel_display_power_well.h
@@ -15,16 +15,16 @@ struct i915_power_well_ops;
 struct intel_display;
 struct intel_encoder;
 
-#define for_each_power_well(__dev_priv, __power_well)                          \
-       for ((__power_well) = (__dev_priv)->display.power.domains.power_wells;  \
-            (__power_well) - (__dev_priv)->display.power.domains.power_wells < \
-               (__dev_priv)->display.power.domains.power_well_count;           \
+#define for_each_power_well(___display, __power_well)                  \
+       for ((__power_well) = (___display)->power.domains.power_wells;  \
+            (__power_well) - (___display)->power.domains.power_wells < \
+                    (___display)->power.domains.power_well_count;      \
             (__power_well)++)
 
-#define for_each_power_well_reverse(__dev_priv, __power_well)                  \
-       for ((__power_well) = (__dev_priv)->display.power.domains.power_wells +         \
-                             (__dev_priv)->display.power.domains.power_well_count - 1; \
-            (__power_well) - (__dev_priv)->display.power.domains.power_wells >= 0;     \
+#define for_each_power_well_reverse(___display, __power_well)          \
+       for ((__power_well) = (___display)->power.domains.power_wells + \
+                    (___display)->power.domains.power_well_count - 1;  \
+            (__power_well) - (___display)->power.domains.power_wells >= 0; \
             (__power_well)--)
 
 /*