summaryrefslogtreecommitdiff
authorMatthias Hopf <mhopf@suse.de>2007-10-24 18:31:51 (GMT)
committer Matthias Hopf <mhopf@suse.de>2007-10-24 18:31:51 (GMT)
commit48ca5961caee62f2980017a6bdc96a1b4c747727 (patch) (side-by-side diff)
tree08829216c49793d07727e47a14630d8c680e2f1a
parentd502521c3669f3f22b94c39a64ab63bfd92c6a97 (diff)
downloadxserver-48ca5961caee62f2980017a6bdc96a1b4c747727.zip
xserver-48ca5961caee62f2980017a6bdc96a1b4c747727.tar.gz
Prefer configured DisplaySize to probed DDC data, if available.
Based on patch by Hong Liu <hong.liu@intel.com>.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--hw/xfree86/modes/xf86RandR12.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index 38435c9..7169f74 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -426,8 +426,18 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
xf86OutputPtr output = config->output[config->compat_output];
xf86CrtcPtr crtc = output->crtc;
- if (crtc && crtc->mode.HDisplay &&
- output->mm_width && output->mm_height)
+ if (output->conf_monitor &&
+ (output->conf_monitor->mon_width > 0 &&
+ output->conf_monitor->mon_height > 0))
+ {
+ /*
+ * Prefer user configured DisplaySize
+ */
+ mmWidth = output->conf_monitor->mon_width;
+ mmHeight = output->conf_monitor->mon_height;
+ }
+ else if (crtc && crtc->mode.HDisplay &&
+ output->mm_width && output->mm_height)
{
/*
* If the output has a mode and a declared size, use that