From c3ac899d106ff8c7a530af8b6e02affa7f5fdf9c Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 20 Mar 2012 13:07:06 +0100
Subject: [PATCH] --- yaml --- r: 306975 b: refs/heads/master c:
 121d527a323f3fde313a8f522060ba859ee405b3 h: refs/heads/master i:   306973:
 77f82dce133f388b266a6f857f95054901c879f2   306971:
 7e2bafda440190a406236e1fe1a0c07fa3f001c7   306967:
 4f152b52f4dbe6644406581f53d95db0f8807a6a   306959:
 92b5bf637908469d9ef60f3d6e7d587eb4538350   306943:
 ec5cdaac4df5ea26e9b582d26847feb62c9090fb v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/i915/i915_drv.c      | 6 ++++++
 trunk/drivers/gpu/drm/i915/i915_drv.h      | 1 +
 trunk/drivers/gpu/drm/i915/intel_display.c | 4 ++++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3b1ae9c9a5c5..1da383cc044c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b03543857fd75876b96e10d4320b775e95041bb7
+refs/heads/master: 121d527a323f3fde313a8f522060ba859ee405b3
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c
index 0e797d3cb5f4..8e2c52ec5a9e 100644
--- a/trunk/drivers/gpu/drm/i915/i915_drv.c
+++ b/trunk/drivers/gpu/drm/i915/i915_drv.c
@@ -80,6 +80,12 @@ MODULE_PARM_DESC(lvds_downclock,
 		"Use panel (LVDS/eDP) downclocking for power savings "
 		"(default: false)");
 
+int i915_lvds_channel_mode __read_mostly;
+module_param_named(lvds_channel_mode, i915_lvds_channel_mode, int, 0600);
+MODULE_PARM_DESC(lvds_channel_mode,
+		 "Specify LVDS channel mode "
+		 "(0=probe BIOS [default], 1=single-channel, 2=dual-channel)");
+
 int i915_panel_use_ssc __read_mostly = -1;
 module_param_named(lvds_use_ssc, i915_panel_use_ssc, int, 0600);
 MODULE_PARM_DESC(lvds_use_ssc,
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.h b/trunk/drivers/gpu/drm/i915/i915_drv.h
index 4cbed7f23e72..f2f9dd933ce4 100644
--- a/trunk/drivers/gpu/drm/i915/i915_drv.h
+++ b/trunk/drivers/gpu/drm/i915/i915_drv.h
@@ -1064,6 +1064,7 @@ extern int i915_panel_ignore_lid __read_mostly;
 extern unsigned int i915_powersave __read_mostly;
 extern int i915_semaphores __read_mostly;
 extern unsigned int i915_lvds_downclock __read_mostly;
+extern int i915_lvds_channel_mode __read_mostly;
 extern int i915_panel_use_ssc __read_mostly;
 extern int i915_vbt_sdvo_panel_type __read_mostly;
 extern int i915_enable_rc6 __read_mostly;
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
index a76ac2eb9938..a0e31660381c 100644
--- a/trunk/drivers/gpu/drm/i915/intel_display.c
+++ b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -365,6 +365,10 @@ static bool is_dual_link_lvds(struct drm_i915_private *dev_priv,
 {
 	unsigned int val;
 
+	/* use the module option value if specified */
+	if (i915_lvds_channel_mode > 0)
+		return i915_lvds_channel_mode == 2;
+
 	if (dev_priv->lvds_val)
 		val = dev_priv->lvds_val;
 	else {