| author | Keith Packard <keithp@koto.keithp.com> | 2007-10-22 20:38:16 (GMT) |
|---|---|---|
| committer | Keith Packard <keithp@koto.keithp.com> | 2007-10-22 20:38:16 (GMT) |
| commit | 29e0e180729a4f0cc020985a4de4c8bc4b9c7f5f (patch) (side-by-side diff) | |
| tree | b5266a48251c9892a4852f18411156ffb536138b | |
| parent | fbe19c66c36acfb484809111cf02579a3baf2f0f (diff) | |
| download | xserver-29e0e180729a4f0cc020985a4de4c8bc4b9c7f5f.zip xserver-29e0e180729a4f0cc020985a4de4c8bc4b9c7f5f.tar.gz | |
Leave hardware-specified preferred modes alone when user preference exists.
Instead of removing the preference bit marking the hardware declared mode
preference, leave it in place and just move the user preferred mode to the
front of the list while marking it with the USERPREF bit which will cause it
to be selected by the initial mode selection code.
| -rw-r--r-- | hw/xfree86/modes/xf86Crtc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c index 0a48d5b..bb416fd 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c @@ -1417,9 +1417,8 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) output->probed_modes = mode; } mode->type |= (M_T_PREFERRED|M_T_USERPREF); + break; } - else - mode->type &= ~M_T_PREFERRED; } } |