drm/i915: move module parameters into a struct, in a new file

With 20+ module parameters, I think referring to them via a struct
improves clarity over just having a bunch of globals. While at it, move
the parameter initialization and definitions into a new file
i915_params.c to reduce clutter in i915_drv.c.

Apart from the ill-named i915_enable_rc6, i915_enable_fbc and
i915_enable_ppgtt parameters, for which we lose the "i915_" prefix
internally, the module parameters now look the same both on the kernel
command line and in code. For example, "i915.modeset".

The downsides of the change are losing static on a couple of variables
and not having the initialization and module_param_named() right next to
each other. On the other hand, all module parameters are now defined in
one place at i915_params.c. Plus you can do this to find all module
parameter references:

$ git grep "i915\." -- drivers/gpu/drm/i915

v2:
- move the definitions into a new file
- s/i915_params/i915/
- make i915_try_reset i915.reset, for consistency

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index d91d9acfc3ff..f38470f795d7 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -469,7 +469,7 @@ void intel_update_fbc(struct drm_device *dev)
                 return;
         }
 
-        if (!i915_powersave) {
+        if (!i915.powersave) {
                 if (set_no_fbc_reason(dev_priv, FBC_MODULE_PARAM))
                         DRM_DEBUG_KMS("fbc disabled per module param\n");
                 return;
@@ -508,13 +508,13 @@ void intel_update_fbc(struct drm_device *dev)
         obj = intel_fb->obj;
         adjusted_mode = &intel_crtc->config.adjusted_mode;
 
-        if (i915_enable_fbc < 0 &&
+        if (i915.enable_fbc < 0 &&
             INTEL_INFO(dev)->gen <= 7 && !IS_HASWELL(dev)) {
                 if (set_no_fbc_reason(dev_priv, FBC_CHIP_DEFAULT))
                         DRM_DEBUG_KMS("disabled per chip default\n");
                 goto out_disable;
         }
-        if (!i915_enable_fbc) {
+        if (!i915.enable_fbc) {
                 if (set_no_fbc_reason(dev_priv, FBC_MODULE_PARAM))
                         DRM_DEBUG_KMS("fbc disabled per module param\n");
                 goto out_disable;
@@ -3154,8 +3154,8 @@ int intel_enable_rc6(const struct drm_device *dev)
                 return 0;
 
         /* Respect the kernel parameter if it is set */
-        if (i915_enable_rc6 >= 0)
-                return i915_enable_rc6;
+        if (i915.enable_rc6 >= 0)
+                return i915.enable_rc6;
 
         /* Disable RC6 on Ironlake */
         if (INTEL_INFO(dev)->gen == 5)
@@ -5279,7 +5279,7 @@ static void __intel_power_well_put(struct drm_device *dev,
         WARN_ON(!power_well->count);
 
         if (!--power_well->count && power_well->set &&
-            i915_disable_power_well) {
+            i915.disable_power_well) {
                 power_well->set(dev, power_well, false);
                 hsw_enable_package_c8(dev_priv);
         }