xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/modes/xf86EdidModes.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

New commits:
diff-tree c079cce9d884ab03f305b3fba4a4e1247c023480 (from 9c47b86bd9a4633fda5fd305a09ac8623187efa0)
Author: Daniel Ciocea <daniel.ciocea at eosystems.ro>
Date:   Fri Jun 8 18:12:21 2007 -0700

    Fix sync polarity on Samsung SyncMaster 205BW monitor.
    
    need to use standard VESA sync polarity instead of the
    EDID provided -hsync -vsync values.

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index 46cb6c4..a9f9ddc 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -71,7 +71,11 @@ static Bool quirk_dt_sync_hm_vp (int scr
     if (memcmp (DDC->vendor.name, "VSC", 4) == 0 &&
 	DDC->vendor.prod_id == 58653)
 	return TRUE;
-
+    /* Samsung SyncMaster 205BW */
+    if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&
+	DDC->vendor.prod_id == 541)
+	return TRUE;
+     
     return FALSE;
 }