From ef8e4b1591d0411000a2ad399e47e08bb7ecb7fa Mon Sep 17 00:00:00 2001
From: Jani Nikula <jani.nikula@intel.com>
Date: Mon, 12 Nov 2012 14:33:44 +0200
Subject: [PATCH] --- yaml --- r: 335679 b: refs/heads/master c:
 2f4f649a69a9eb51f6e98130e19dd90a260a4145 h: refs/heads/master i:   335677:
 ec4e202667ae7522ca2c151c7db83a976305be23   335675:
 8ca93f8a8e0ad0def91af0db3a3e54d6b148f0c0   335671:
 90ce4a51fab7e760c21fd9c3fdb87258b5442ad3   335663:
 681964fbea28569278a390afbf5c62013d25d9a7   335647:
 f357351bf12ca13d11caae088ae8d50c4c4a5ad5   335615:
 fc0bd36f5857bddcad02526b1788ac81027673e2 v: v3

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

diff --git a/[refs] b/[refs]
index 4fb9e1509873..78ff21bb403f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0ddfbd3d1346c1f481ec2289eef350cdba64b42
+refs/heads/master: 2f4f649a69a9eb51f6e98130e19dd90a260a4145
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
index 461a637f1ef7..4154bcd7a070 100644
--- a/trunk/drivers/gpu/drm/i915/intel_display.c
+++ b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -3841,6 +3841,17 @@ static bool intel_choose_pipe_bpp_dither(struct drm_crtc *crtc,
 			}
 		}
 
+		if (intel_encoder->type == INTEL_OUTPUT_EDP) {
+			/* Use VBT settings if we have an eDP panel */
+			unsigned int edp_bpc = dev_priv->edp.bpp / 3;
+
+			if (edp_bpc < display_bpc) {
+				DRM_DEBUG_KMS("clamping display bpc (was %d) to eDP (%d)\n", display_bpc, edp_bpc);
+				display_bpc = edp_bpc;
+			}
+			continue;
+		}
+
 		/*
 		 * HDMI is either 12 or 8, so if the display lets 10bpc sneak
 		 * through, clamp it down.  (Note: >12bpc will be caught below.)