forked from pool/xorg-x11-server
27 lines
937 B
Diff
27 lines
937 B
Diff
|
commit 29e0e180729a4f0cc020985a4de4c8bc4b9c7f5f
|
||
|
|
Author: Keith Packard <keithp@koto.keithp.com>
|
||
|
|
Date: Mon Oct 22 13:38:16 2007 -0700
|
||
|
|
|
||
|
|
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.
|
||
|
|
|
||
|
|
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;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|