summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorKeith Packard <keithp@neko.keithp.com>2007-07-19 13:28:00 -0700
committerKeith Packard <keithp@neko.keithp.com>2007-07-19 13:31:07 -0700
commitdc9c5196282ba61bd542e198dfe0d53d93181591 (patch)
treed35d8385b51a54db60cedaaad31c70745339cea1 /hw
parent73a93c5a6b68f7ba21f9e75f50b1032603a3b39e (diff)
Make PreferredMode option in config file override EDID mode preferences.
When the PreferredMode option is selected in the config file, remove the M_T_PREFERRED bit from all other preferred modes to force the config file mode to be selected.
Diffstat (limited to 'hw')
-rw-r--r--hw/xfree86/modes/xf86Crtc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 1899d7fd3..170c92176 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -1414,8 +1414,9 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
output->probed_modes = mode;
}
mode->type |= M_T_PREFERRED;
- break;
}
+ else
+ mode->type &= ~M_T_PREFERRED;
}
}