move all of the module params into one place

4 files changed, 24 insertions, 5 deletions

diff --git a/sys/dev/pci/drm/i915_drv.c b/sys/dev/pci/drm/i915_drv.c
index f343ee15bfb..d096443b225 100644
--- a/sys/dev/pci/drm/i915_drv.c
+++ b/sys/dev/pci/drm/i915_drv.c
@@ -89,6 +89,27 @@ int i915_enable_fbc = -1;
  */
 int i915_enable_rc6 = -1;
 
+/* Use panel (LVDS/eDP) downclocking for power savings (default: false) */
+unsigned int i915_lvds_downclock = 0;
+
+/*
+ * Specify LVDS channel mode
+ * (0=probe BIOS [default], 1=single-channel, 2=dual-channel)
+ */
+int i915_lvds_channel_mode = 0;
+
+/*
+ * Use Spread Spectrum Clock with panels [LVDS/eDP]
+ * (default: auto from VBT)
+ */
+int i915_panel_use_ssc = -1;
+
+/*
+ * Override/Ignore selection of SDVO panel mode in the VBT
+ * (-2=ignore, -1=auto [default], index in VBT BIOS table)
+ */
+int i915_vbt_sdvo_panel_type = -1;
+
 const struct intel_device_info *
 	i915_get_device_id(int);
 int	inteldrm_probe(struct device *, void *, void *);
diff --git a/sys/dev/pci/drm/i915_drv.h b/sys/dev/pci/drm/i915_drv.h
index 4e766505866..559187d6de0 100644
--- a/sys/dev/pci/drm/i915_drv.h
+++ b/sys/dev/pci/drm/i915_drv.h
@@ -1503,9 +1503,12 @@ read64(struct inteldrm_softc *dev_priv, bus_size_t off)
 #define INTEL_RC6pp_ENABLE			(1<<2)
 
 extern unsigned int i915_lvds_downclock;
+extern int i915_lvds_channel_mode;
+extern int i915_panel_use_ssc;
 extern int i915_panel_ignore_lid;
 extern unsigned int i915_powersave;
 extern int i915_semaphores;
+extern int i915_vbt_sdvo_panel_type;
 extern int i915_enable_rc6;
 extern int i915_enable_fbc;
 
diff --git a/sys/dev/pci/drm/intel_bios.c b/sys/dev/pci/drm/intel_bios.c
index 7b6ddf57390..fe22486003f 100644
--- a/sys/dev/pci/drm/intel_bios.c
+++ b/sys/dev/pci/drm/intel_bios.c
@@ -64,8 +64,6 @@ const struct lvds_fp_timing *
 bool	 dmi_found(const struct dmi_system_id *);
 
 static int panel_type;
-unsigned int i915_lvds_downclock = 0;
-static int i915_vbt_sdvo_panel_type = -1;
 
 void *
 find_section(struct bdb_header *bdb, int section_id)
diff --git a/sys/dev/pci/drm/intel_display.c b/sys/dev/pci/drm/intel_display.c
index 0f36c7b72c5..4c99535423e 100644
--- a/sys/dev/pci/drm/intel_display.c
+++ b/sys/dev/pci/drm/intel_display.c
@@ -395,9 +395,6 @@ bool	 intel_check_plane_mapping(struct intel_crtc *);
 void	 intel_sanitize_crtc(struct intel_crtc *);
 void	 intel_sanitize_encoder(struct intel_encoder *);
 
-int i915_lvds_channel_mode;
-int i915_panel_use_ssc = -1;
-
 int
 intel_pch_rawclk(struct drm_device *dev)
 {