From 87dfd60c1ec5f7e87a8a80832a1439c2100a5618 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Sat, 5 May 2012 00:39:21 +1000
Subject: [PATCH] --- yaml --- r: 307565 b: refs/heads/master c:
 a6a17859f1bdf607650ee055101f54c5f207762b h: refs/heads/master i:   307563:
 e97bdbae7d797b443e0f595cc41588b84cdda0e4 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_connector.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7e7c94d70140..31cd381b89b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c75f332e50949b62add5d5fc3f7ee4829c8972a
+refs/heads/master: a6a17859f1bdf607650ee055101f54c5f207762b
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c b/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c
index fa860358add1..7b11edb077d0 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -654,7 +654,13 @@ nouveau_connector_detect_depth(struct drm_connector *connector)
 	if (nv_connector->edid && connector->display_info.bpc)
 		return;
 
-	/* if not, we're out of options unless we're LVDS, default to 8bpc */
+	/* EDID 1.4 is *supposed* to be supported on eDP, but, Apple... */
+	if (nv_connector->type == DCB_CONNECTOR_eDP) {
+		connector->display_info.bpc = 6;
+		return;
+	}
+
+	/* we're out of options unless we're LVDS, default to 8bpc */
 	if (nv_encoder->dcb->type != OUTPUT_LVDS) {
 		connector->display_info.bpc = 8;
 		return;