drm/i915: Rename global i915 to i915_modparams

Our global struct with params is named exactly the same way
as new preferred name for the drm_i915_private function parameter.
To avoid such name reuse lets use different name for the global.

v5: pure rename
v6: fix

Credits-to: Coccinelle

@@
identifier n;
@@
(
-	i915.n
+	i915_modparams.n
)

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Ville Syrjala <ville.syrjala@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170919193846.38060-1-michal.wajdeczko@intel.com

1 files changed, 9 insertions, 8 deletions

diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index a3bfb9f27e7a..7933d1bc6a1c 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -2413,7 +2413,7 @@ static uint32_t get_allowed_dc_mask(const struct drm_i915_private *dev_priv,
                 mask = 0;
         }
 
-        if (!i915.disable_power_well)
+        if (!i915_modparams.disable_power_well)
                 max_dc = 0;
 
         if (enable_dc >= 0 && enable_dc <= max_dc) {
@@ -2471,10 +2471,11 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv)
 {
         struct i915_power_domains *power_domains = &dev_priv->power_domains;
 
-        i915.disable_power_well = sanitize_disable_power_well_option(dev_priv,
-                                                     i915.disable_power_well);
-        dev_priv->csr.allowed_dc_mask = get_allowed_dc_mask(dev_priv,
-                                                            i915.enable_dc);
+        i915_modparams.disable_power_well =
+                sanitize_disable_power_well_option(dev_priv,
+                                                   i915_modparams.disable_power_well);
+        dev_priv->csr.allowed_dc_mask =
+                get_allowed_dc_mask(dev_priv, i915_modparams.enable_dc);
 
         BUILD_BUG_ON(POWER_DOMAIN_NUM > 64);
 
@@ -2535,7 +2536,7 @@ void intel_power_domains_fini(struct drm_i915_private *dev_priv)
         intel_display_set_init_power(dev_priv, true);
 
         /* Remove the refcount we took to keep power well support disabled. */
-        if (!i915.disable_power_well)
+        if (!i915_modparams.disable_power_well)
                 intel_display_power_put(dev_priv, POWER_DOMAIN_INIT);
 
         /*
@@ -2995,7 +2996,7 @@ void intel_power_domains_init_hw(struct drm_i915_private *dev_priv, bool resume)
         /* For now, we need the power well to be always enabled. */
         intel_display_set_init_power(dev_priv, true);
         /* Disable power support if the user asked so. */
-        if (!i915.disable_power_well)
+        if (!i915_modparams.disable_power_well)
                 intel_display_power_get(dev_priv, POWER_DOMAIN_INIT);
         intel_power_domains_sync_hw(dev_priv);
         power_domains->initializing = false;
@@ -3014,7 +3015,7 @@ void intel_power_domains_suspend(struct drm_i915_private *dev_priv)
          * Even if power well support was disabled we still want to disable
          * power wells while we are system suspended.
          */
-        if (!i915.disable_power_well)
+        if (!i915_modparams.disable_power_well)
                 intel_display_power_put(dev_priv, POWER_DOMAIN_INIT);
 
         if (IS_CANNONLAKE(dev_priv))