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:11:40 -0400 |
| commit | 95985256efa7e86cefe4b1541780eda12c0c8f89 (patch) | |
| tree | a1f69d732ab2d891c9f23bad11d7bba3e54f8a70 | |
| parent | bedcf985580e7d6684ee9079fe955b6a7e49ad48 (diff) | |
xf86SetDesiredModes(): Skip disabled CRTCs first thing.
(cherry picked from commit 14726b776d6cebb7d864b6ffa7554e1ce5637d5c)
| -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 57fc2c784..e857b077a 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c @@ -2188,6 +2188,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 @@ -2199,9 +2203,7 @@ xf86SetDesiredModes (ScrnInfoPtr scrn) break; } } - /* - * Skip disabled crtcs - */ + /* paranoia */ if (!output) continue; |