diff options
author | Michal Wajdeczko <michal.wajdeczko@intel.com> | 2017-09-19 15:38:44 -0400 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2017-09-22 07:50:36 -0400 |
commit | 4f044a88a86adb4c8cc6cb1a7303bb9c61ea2caa (patch) | |
tree | 564beebc998c2fa33c24fbc7c93c56be86dd3f97 /drivers/gpu/drm/i915/intel_pm.c | |
parent | a3df2c857c103b1103c9d578d68193a6fbe63c61 (diff) |
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
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index adfeb7bb8874..c66af09e27a7 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c | |||
@@ -7825,7 +7825,7 @@ void intel_init_gt_powersave(struct drm_i915_private *dev_priv) | |||
7825 | * RPM depends on RC6 to save restore the GT HW context, so make RC6 a | 7825 | * RPM depends on RC6 to save restore the GT HW context, so make RC6 a |
7826 | * requirement. | 7826 | * requirement. |
7827 | */ | 7827 | */ |
7828 | if (!i915.enable_rc6) { | 7828 | if (!i915_modparams.enable_rc6) { |
7829 | DRM_INFO("RC6 disabled, disabling runtime PM support\n"); | 7829 | DRM_INFO("RC6 disabled, disabling runtime PM support\n"); |
7830 | intel_runtime_pm_get(dev_priv); | 7830 | intel_runtime_pm_get(dev_priv); |
7831 | } | 7831 | } |
@@ -7882,7 +7882,7 @@ void intel_cleanup_gt_powersave(struct drm_i915_private *dev_priv) | |||
7882 | if (IS_VALLEYVIEW(dev_priv)) | 7882 | if (IS_VALLEYVIEW(dev_priv)) |
7883 | valleyview_cleanup_gt_powersave(dev_priv); | 7883 | valleyview_cleanup_gt_powersave(dev_priv); |
7884 | 7884 | ||
7885 | if (!i915.enable_rc6) | 7885 | if (!i915_modparams.enable_rc6) |
7886 | intel_runtime_pm_put(dev_priv); | 7886 | intel_runtime_pm_put(dev_priv); |
7887 | } | 7887 | } |
7888 | 7888 | ||
@@ -8004,7 +8004,7 @@ static void __intel_autoenable_gt_powersave(struct work_struct *work) | |||
8004 | if (IS_ERR(req)) | 8004 | if (IS_ERR(req)) |
8005 | goto unlock; | 8005 | goto unlock; |
8006 | 8006 | ||
8007 | if (!i915.enable_execlists && i915_switch_context(req) == 0) | 8007 | if (!i915_modparams.enable_execlists && i915_switch_context(req) == 0) |
8008 | rcs->init_context(req); | 8008 | rcs->init_context(req); |
8009 | 8009 | ||
8010 | /* Mark the device busy, calling intel_enable_gt_powersave() */ | 8010 | /* Mark the device busy, calling intel_enable_gt_powersave() */ |