---

yaml --- r: 296735 b: refs/heads/master c: c843536 h: refs/heads/master i: 296733: dd5a9da 296731: c377b44 296727: c929f70 296719: f88c954 296703: 8b30f81 v: v3
git-mirror · Mar 26, 2012 · cff0e17 · cff0e17
1 parent dfeb55f
commit cff0e17
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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) {