xserver: Branch 'master' - 2 commits

[Adam Jackson]

 hw/xfree86/ddc/interpret_edid.c |   10 +++++++---
 include/dix-config.h.in         |    6 ++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit bd9c6b3a4d726a3f83ac6d8cf7211eddbc28f25a
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Oct 14 14:04:01 2008 -0400

    EDID: Catch even more cases of encoding aspect as size.
    
    Very cute, Samsung, not only do you claim to be 16cm by 9cm in the
    global size record, you also claim to be 160mm by 90mm in the detailed
    timings.  Grrr.

diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c
index 3596e87..fbb17b1 100644
--- a/hw/xfree86/ddc/interpret_edid.c
+++ b/hw/xfree86/ddc/interpret_edid.c
@@ -115,12 +115,16 @@ handle_edid_quirks(xf86MonPtr m)
 	    }
 	}
 
-	if (real_hsize && real_vsize) {
+	if (!real_hsize || !real_vsize) {
+	    m->features.hsize = m->features.vsize = 0;
+	} else if ((m->features.hsize * 10 == real_hsize) &&
+		   (m->features.vsize * 10 == real_vsize)) {
+	    /* exact match is just unlikely, should do a better check though */
+	    m->features.hsize = m->features.vsize = 0;
+	} else {
 	    /* convert mm to cm */
 	    m->features.hsize = (real_hsize + 5) / 10;
 	    m->features.vsize = (real_vsize + 5) / 10;
-	} else {
-	    m->features.hsize = m->features.vsize = 0;
 	}
 	
 	xf86Msg(X_INFO, "Quirked EDID physical size to %dx%d cm\n",
commit ad677238bc96a8578113bbe76d605d7a87aca44c
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Oct 14 13:00:50 2008 -0400

    Add backtrace definitions to dix-config.h.in

diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 26f4b6a..6c3d91c 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -75,6 +75,9 @@
 /* Define to 1 if you have the <asm/mtrr.h> header file. */
 #undef HAVE_ASM_MTRR_H
 
+/* Has backtrace support */
+#undef HAVE_BACKTRACE
+
 /* Define to 1 if you have the <byteswap.h> header file. */
 #undef HAVE_BYTESWAP_H
 
@@ -94,6 +97,9 @@
 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
 #undef HAVE_DOPRNT
 
+/* Have execinfo.h */
+#undef HAVE_EXECINFO_H
+
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H