--- xorg-server-1.4.1~git20080131/hw/xfree86/modes/xf86EdidModes.c	2008-02-01 04:40:14.000000000 +0100
+++ xorg-server-1.4.1~git20080131/hw/xfree86/modes/xf86EdidModes.c	2008-02-28 12:16:00.725935688 +0100
@@ -407,8 +407,15 @@
 
     Monitor->DDC = DDC;
 
-    Monitor->widthmm = 10 * DDC->features.hsize;
-    Monitor->heightmm = 10 * DDC->features.vsize;
+    /*
+     * Skip widthmm & heightmm because xf86SetDpi assumes they contain
+     * values specified in the config file. Setting them now would break the
+     * DisplaySize option, and xf86SetDpi would never write to the log that
+     * DPI settings have been probed.
+     *
+     * Monitor->widthmm = 10 * DDC->features.hsize;
+     * Monitor->heightmm = 10 * DDC->features.vsize;
+     */
 
     /* If this is a digital display, then we can use reduced blanking */
     if (DDC->features.input_type)