From cff0e175dede87590567df1c9af899bb7bfd940a Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Sat, 24 Mar 2012 16:26:13 +1000
Subject: [PATCH] --- yaml --- r: 296735 b: refs/heads/master c:
 c8435362f2211086b34ce871fa9c3fcc7ca79ff9 h: refs/heads/master i:   296733:
 dd5a9dae76c6ca5ec77fd35f660b13c8f1e63494   296731:
 c377b44cfcc60a49eaaf5baf2cfee33a48ae4bd9   296727:
 c929f70d493d7191b7bb29015ff4c6d12d65c695   296719:
 f88c9540166a6528ee00f3c130ba8812977d95cb   296703:
 8b30f811fa69766753b2fdf34d35d3b672678d33 v: v3

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

diff --git a/[refs] b/[refs]
index 1edb833c71a0..a76cd56307a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c61205b24b79cd3708e751ed9c33970f487686ab
+refs/heads/master: c8435362f2211086b34ce871fa9c3fcc7ca79ff9
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c b/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c
index 8f510fd956b0..fa860358add1 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -654,10 +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 6bpc */
-	connector->display_info.bpc = 6;
-	if (nv_encoder->dcb->type != OUTPUT_LVDS)
+	/* if not, 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;
+	}
+
+	connector->display_info.bpc = 6;
 
 	/* LVDS: panel straps */
 	if (bios->fp_no_ddc) {