diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-02-09 12:30:35 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-02-10 08:19:33 +1000 |
| commit | 5025b43120b629bdf11087a3c652dc9cbe172191 (patch) | |
| tree | 39bef906266dd017091002df037a57523709e54e | |
| parent | 39c9bfb453b748ce220ceefacbe2a5c19fabf67b (diff) | |
| download | blackbird-op-linux-5025b43120b629bdf11087a3c652dc9cbe172191.tar.gz blackbird-op-linux-5025b43120b629bdf11087a3c652dc9cbe172191.zip | |
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>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_sor.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c index ecf1936b8224..c2fff543b06f 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; |
