From 770a13c44c55d57982f3c08be447b572cb44c10c Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Wed, 19 Oct 2011 13:06:48 +1000
Subject: [PATCH] --- yaml --- r: 282591 b: refs/heads/master c:
 c833442306c6578236af32561c229c9e7ca58079 h: refs/heads/master i:   282589:
 c1fb920b32e768b006b1ea67e7abe1217f1918da   282587:
 c94073ef9f3b3453bc213a4528d721f7df760397   282583:
 f15a6d9fc3874fcbcd76966556fd8fb536294a84   282575:
 d753606d8cc42a811fc444870619806b6ae2625d   282559:
 6f9c30233f4ad589081c1607edd0823c2a7d5b97 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_connector.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e5991b45d2ea..76a1dcb29644 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ceca5f8649125645fc4e7f178a1dca1345ab9b4
+refs/heads/master: c833442306c6578236af32561c229c9e7ca58079
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c b/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c
index 592fcfb9b389..576fb9af5d13 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -198,6 +198,10 @@ nouveau_connector_set_encoder(struct drm_connector *connector,
 		return;
 	nv_connector->detected_encoder = nv_encoder;
 
+	if (dev_priv->card_type >= NV_50) {
+		connector->interlace_allowed = true;
+		connector->doublescan_allowed = true;
+	} else
 	if (nv_encoder->dcb->type == OUTPUT_LVDS ||
 	    nv_encoder->dcb->type == OUTPUT_TMDS) {
 		connector->doublescan_allowed = false;