From 33f6184e834f49d0bce4be9bc4462507a142d5d5 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 30 Mar 2010 16:01:41 +1000
Subject: [PATCH] --- yaml --- r: 189695 b: refs/heads/master c:
 e60a9df3a8e60e5f16707897467b36702e8c4cdc h: refs/heads/master i:   189693:
 21f754b50c523af275832edd442d135770b0a4ba   189691:
 c54c6a68331b9d59430025d8c506b3a65b202674   189687:
 36786b6c7007b4ee2bbb0f88f215598ac31cf1d3   189679:
 6f57455fb4281d0172ccec25e750c7288fba77fb   189663:
 24c9ab32aedb4b78f138a82c0ffe38bd363ba511   189631:
 772f4b2eaef6ba9b09ebc340cc93c96fe91e697d   189567:
 42eb74ef07efda1aaf6b4bce3a6993b01e65a871   189439:
 0cbc7720731bb79fb60b9b8b5ddc7e7787ac988b v: v3

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

diff --git a/[refs] b/[refs]
index 41dd86e864d2..0bef7a00a69a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5acac66685397a73bed8638114262520565e41c
+refs/heads/master: e60a9df3a8e60e5f16707897467b36702e8c4cdc
diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_sor.c b/trunk/drivers/gpu/drm/nouveau/nv50_sor.c
index e31ba312c2ff..0c68698f23df 100644
--- a/trunk/drivers/gpu/drm/nouveau/nv50_sor.c
+++ b/trunk/drivers/gpu/drm/nouveau/nv50_sor.c
@@ -337,6 +337,9 @@ nv50_sor_create(struct drm_device *dev, struct dcb_entry *entry)
 		default:
 			break;
 		}
+
+		if (!nv_encoder->dp.mc_unknown)
+			nv_encoder->dp.mc_unknown = 5;
 	}
 
 	return 0;