From 1435407075f5b74bb604b6d343fc8b53e558e10f Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 9 Feb 2010 12:30:35 +1000
Subject: [PATCH] --- yaml --- r: 180486 b: refs/heads/master c:
 5025b43120b629bdf11087a3c652dc9cbe172191 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 79045cc2a8bd..40522c99ea14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39c9bfb453b748ce220ceefacbe2a5c19fabf67b
+refs/heads/master: 5025b43120b629bdf11087a3c652dc9cbe172191
diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_sor.c b/trunk/drivers/gpu/drm/nouveau/nv50_sor.c
index ecf1936b8224..c2fff543b06f 100644
--- a/trunk/drivers/gpu/drm/nouveau/nv50_sor.c
+++ b/trunk/drivers/gpu/drm/nouveau/nv50_sor.c
@@ -101,6 +101,7 @@ nv50_sor_dpms(struct drm_encoder *encoder, int mode)
 		struct nouveau_encoder *nvenc = nouveau_encoder(enc);
 
 		if (nvenc == nv_encoder ||
+		    nvenc->disconnect != nv50_sor_disconnect ||
 		    nvenc->dcb->or != nv_encoder->dcb->or)
 			continue;