---

yaml --- r: 180486 b: refs/heads/master c: 5025b43 h: refs/heads/master v: v3
git-mirror · Feb 9, 2010 · 1435407 · 1435407
1 parent d8af255
commit 1435407
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;