xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/modes/xf86EdidModes.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 3b73d62791d925c465ec855f96981d151dd3c179
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Mar 3 15:43:22 2008 -0500

    xf86DDCMonitorSet: Honor the DisplaySize from the config file.
    
    We honor sync ranges and pixel clock settings from the config here, no
    reason to ignore DisplaySize.

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index a9d6722..ea36d0a 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -662,8 +662,10 @@ xf86DDCMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC)
 
     Monitor->DDC = DDC;
 
-    Monitor->widthmm = 10 * DDC->features.hsize;
-    Monitor->heightmm = 10 * DDC->features.vsize;
+    if (Monitor->widthmm <= 0 && Monitor->heightmm <= 0) {
+	Monitor->widthmm = 10 * DDC->features.hsize;
+	Monitor->heightmm = 10 * DDC->features.vsize;
+    }
 
     /*
      * If this is a digital display, then we can use reduced blanking.