From: Ben Skeggs Date: Tue, 9 Feb 2010 02:30:35 +0000 (+1000) Subject: drm/nv50: disregard dac outputs in nv50_sor_dpms() X-Git-Tag: 2.1b_release~8485^2~84^2~51 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5025b43120b629bdf11087a3c652dc9cbe172191;p=platform%2Fkernel%2Fkernel-mfld-blackbay.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 --- diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c index ecf1936..c2fff54 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;