From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 9 Feb 2010 02:30:35 +0000 (+1000)
Subject: drm/nv50: disregard dac outputs in nv50_sor_dpms()
X-Git-Tag: v2.6.33-rc8~14^2~2^2~6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5025b43120b629bdf11087a3c652dc9cbe172191;p=~shefty%2Frdma-dev.git

drm/nv50: disregard dac outputs in nv50_sor_dpms()

Fixes DVI+VGA on my 9400, and likely a lot of other configurations that
got broken by the previos DVI-over-DP fix.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c
index ecf1936b822..c2fff543b06 100644
--- a/drivers/gpu/drm/nouveau/nv50_sor.c
+++ b/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;