diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-05-16 10:51:32 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-05-16 11:10:33 -0400 |
| commit | 14726b776d6cebb7d864b6ffa7554e1ce5637d5c (patch) | |
| tree | 0b27ceca0276aa1a8a82c401abc6f5609aa9b74a | |
| parent | 459f34b089aca4f4eee9752600c3a9e4f4e343ab (diff) | |
xf86SetDesiredModes(): Skip disabled CRTCs first thing.
| -rw-r--r-- | hw/xfree86/modes/xf86Crtc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c index 1a49cb532..58c3512f8 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c @@ -2244,6 +2244,10 @@ xf86SetDesiredModes (ScrnInfoPtr scrn) xf86OutputPtr output = NULL; int o; + /* Skip disabled CRTCs */ + if (!crtc->enabled) + continue; + if (config->output[config->compat_output]->crtc == crtc) output = config->output[config->compat_output]; else @@ -2255,9 +2259,7 @@ xf86SetDesiredModes (ScrnInfoPtr scrn) break; } } - /* - * Skip disabled crtcs - */ + /* paranoia */ if (!output) continue; |