aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_device_info.c
diff options
context:
space:
mode:
authorMichal Wajdeczko <[email protected]>2017-09-19 19:38:44 +0000
committerJani Nikula <[email protected]>2017-09-22 11:50:36 +0000
commit4f044a88a86adb4c8cc6cb1a7303bb9c61ea2caa (patch)
tree564beebc998c2fa33c24fbc7c93c56be86dd3f97 /drivers/gpu/drm/i915/intel_device_info.c
parentdrm/i915: Confirm request->global_seqno after spin completion (diff)
downloadkernel-4f044a88a86adb4c8cc6cb1a7303bb9c61ea2caa.tar.gz
kernel-4f044a88a86adb4c8cc6cb1a7303bb9c61ea2caa.zip
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 <[email protected]> Cc: Jani Nikula <[email protected]> Cc: Chris Wilson <[email protected]> Cc: Tvrtko Ursulin <[email protected]> Cc: Ville Syrjala <[email protected]> Cc: Joonas Lahtinen <[email protected]> Acked-by: Joonas Lahtinen <[email protected]> Signed-off-by: Jani Nikula <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/i915/intel_device_info.c')
-rw-r--r--drivers/gpu/drm/i915/intel_device_info.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index 43831b09b47a..fdf9b54b71e9 100644
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -343,7 +343,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
info->num_sprites[pipe] = 1;
}
- if (i915.disable_display) {
+ if (i915_modparams.disable_display) {
DRM_INFO("Display disabled (module parameter)\n");
info->num_pipes = 0;
} else if (info->num_pipes > 0 &&