xserver: Branch 'master'
Matthias Hopf
mhopf at kemper.freedesktop.org
Wed Oct 24 11:32:06 PDT 2007
hw/xfree86/modes/xf86RandR12.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 48ca5961caee62f2980017a6bdc96a1b4c747727
Author: Matthias Hopf <mhopf at suse.de>
Date: Wed Oct 24 20:31:51 2007 +0200
Prefer configured DisplaySize to probed DDC data, if available.
Based on patch by Hong Liu <hong.liu at intel.com>.
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
More information about the xorg-commit
mailing list