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, 13 insertions, 13 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 46b014f6080f..122f87155b8e 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2372,7 +2372,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
          * whether the platform allows pfit disable with pipe active, and only
          * then update the pipesrc and pfit state, even on the flip path.
          */
-        if (i915_fastboot) {
+        if (i915.fastboot) {
                 const struct drm_display_mode *adjusted_mode =
                         &intel_crtc->config.adjusted_mode;
 
@@ -4580,7 +4580,7 @@ retry:
 static void hsw_compute_ips_config(struct intel_crtc *crtc,
                                    struct intel_crtc_config *pipe_config)
 {
-        pipe_config->ips_enabled = i915_enable_ips &&
+        pipe_config->ips_enabled = i915.enable_ips &&
                                    hsw_crtc_supports_ips(crtc) &&
                                    pipe_config->pipe_bpp <= 24;
 }
@@ -4781,8 +4781,8 @@ intel_link_compute_m_n(int bits_per_pixel, int nlanes,
 
 static inline bool intel_panel_use_ssc(struct drm_i915_private *dev_priv)
 {
-        if (i915_panel_use_ssc >= 0)
-                return i915_panel_use_ssc != 0;
+        if (i915.panel_use_ssc >= 0)
+                return i915.panel_use_ssc != 0;
         return dev_priv->vbt.lvds_use_ssc
                 && !(dev_priv->quirks & QUIRK_LVDS_SSC_DISABLE);
 }
@@ -4841,7 +4841,7 @@ static void i9xx_update_pll_dividers(struct intel_crtc *crtc,
 
         crtc->lowfreq_avail = false;
         if (intel_pipe_has_type(&crtc->base, INTEL_OUTPUT_LVDS) &&
-            reduced_clock && i915_powersave) {
+            reduced_clock && i915.powersave) {
                 I915_WRITE(FP1(pipe), fp2);
                 crtc->config.dpll_hw_state.fp1 = fp2;
                 crtc->lowfreq_avail = true;
@@ -6345,7 +6345,7 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
         if (intel_crtc->config.has_dp_encoder)
                 intel_dp_set_m_n(intel_crtc);
 
-        if (is_lvds && has_reduced_clock && i915_powersave)
+        if (is_lvds && has_reduced_clock && i915.powersave)
                 intel_crtc->lowfreq_avail = true;
         else
                 intel_crtc->lowfreq_avail = false;
@@ -6713,7 +6713,7 @@ static void __hsw_enable_package_c8(struct drm_i915_private *dev_priv)
                 return;
 
         schedule_delayed_work(&dev_priv->pc8.enable_work,
-                              msecs_to_jiffies(i915_pc8_timeout));
+                              msecs_to_jiffies(i915.pc8_timeout));
 }
 
 static void __hsw_disable_package_c8(struct drm_i915_private *dev_priv)
@@ -6812,7 +6812,7 @@ static void hsw_update_package_c8(struct drm_device *dev)
         if (!HAS_PC8(dev_priv->dev))
                 return;
 
-        if (!i915_enable_pc8)
+        if (!i915.enable_pc8)
                 return;
 
         mutex_lock(&dev_priv->pc8.lock);
@@ -8210,7 +8210,7 @@ void intel_mark_idle(struct drm_device *dev)
 
         hsw_package_c8_gpu_idle(dev_priv);
 
-        if (!i915_powersave)
+        if (!i915.powersave)
                 return;
 
         list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
@@ -8230,7 +8230,7 @@ void intel_mark_fb_busy(struct drm_i915_gem_object *obj,
         struct drm_device *dev = obj->base.dev;
         struct drm_crtc *crtc;
 
-        if (!i915_powersave)
+        if (!i915.powersave)
                 return;
 
         list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
@@ -9893,7 +9893,7 @@ intel_set_config_compute_mode_changes(struct drm_mode_set *set,
                         struct intel_crtc *intel_crtc =
                                 to_intel_crtc(set->crtc);
 
-                        if (intel_crtc->active && i915_fastboot) {
+                        if (intel_crtc->active && i915.fastboot) {
                                 DRM_DEBUG_KMS("crtc has no fb, will flip\n");
                                 config->fb_changed = true;
                         } else {
@@ -10144,7 +10144,7 @@ static int intel_crtc_set_config(struct drm_mode_set *set)
                  * flipping, so increasing its cost here shouldn't be a big
                  * deal).
                  */
-                if (i915_fastboot && ret == 0)
+                if (i915.fastboot && ret == 0)
                         intel_modeset_check_state(set->crtc->dev);
         }
 
@@ -11382,7 +11382,7 @@ void intel_modeset_setup_hw_state(struct drm_device *dev,
          */
         list_for_each_entry(crtc, &dev->mode_config.crtc_list,
                             base.head) {
-                if (crtc->active && i915_fastboot) {
+                if (crtc->active && i915.fastboot) {
                         intel_crtc_mode_from_pipe_config(crtc, &crtc->config);
 
                         DRM_DEBUG_KMS("[CRTC:%d] found active mode: ",