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/i915_gem.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/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index b0bbf8729dae..12ce97d47afb 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
| @@ -4738,7 +4738,7 @@ bool intel_sanitize_semaphores(struct drm_i915_private *dev_priv, int value) | |||
| 4738 | return false; | 4738 | return false; |
| 4739 | 4739 | ||
| 4740 | /* TODO: make semaphores and Execlists play nicely together */ | 4740 | /* TODO: make semaphores and Execlists play nicely together */ |
| 4741 | if (i915.enable_execlists) | 4741 | if (i915_modparams.enable_execlists) |
| 4742 | return false; | 4742 | return false; |
| 4743 | 4743 | ||
| 4744 | if (value >= 0) | 4744 | if (value >= 0) |
| @@ -4759,7 +4759,7 @@ int i915_gem_init(struct drm_i915_private *dev_priv) | |||
| 4759 | 4759 | ||
| 4760 | dev_priv->mm.unordered_timeline = dma_fence_context_alloc(1); | 4760 | dev_priv->mm.unordered_timeline = dma_fence_context_alloc(1); |
| 4761 | 4761 | ||
| 4762 | if (!i915.enable_execlists) { | 4762 | if (!i915_modparams.enable_execlists) { |
| 4763 | dev_priv->gt.resume = intel_legacy_submission_resume; | 4763 | dev_priv->gt.resume = intel_legacy_submission_resume; |
| 4764 | dev_priv->gt.cleanup_engine = intel_engine_cleanup; | 4764 | dev_priv->gt.cleanup_engine = intel_engine_cleanup; |
| 4765 | } else { | 4765 | } else { |
