xserver: Branch 'master'

[Julien Cristau]

 hw/xfree86/modes/xf86EdidModes.c |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 2be5eecb4b0f30b9c55d12521415edbb88c1f8fd
Author: Julien Cristau <jcristau at debian.org>
Date:   Fri May 15 17:29:32 2009 +0200

    xfree86: add edid quirk for Samsung Syncmaster 2333HD
    
    It reports vertical size in cm in the detailed mode.
    X.Org bug#21750 <http://bugs.freedesktop.org/show_bug.cgi?id=21750>
    
    Reported-by: Peter Poklop <Peter.Poklop at gmx.at>
    Signed-off-by: Julien Cristau <jcristau at debian.org>

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index 9e6a666..4340edd 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -160,6 +160,11 @@ static Bool quirk_detailed_v_in_cm (int scrnIndex, xf86MonPtr DDC)
 	DDC->vendor.prod_id == 47360)
 	return TRUE;
 
+    /* Bug #21750: Samsung Syncmaster 2333HD */
+    if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&
+	DDC->vendor.prod_id == 1157)
+	return TRUE;
+
     return FALSE;
 }