xserver: Branch 'master'

[Julien Cristau]

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

New commits:
commit b1dab580bdfb4acfe3feddeda6e760098ec4922a
Author: Tormod Volden <debian.tormod at gmail.com>
Date:   Wed Apr 1 19:32:21 2009 +0200

    xfree86: edid quirk for Philips LCD LP154W01-TLAJ
    
    This panel reports its vertical size in cm.
    
    X.Org bug#21000 <http://bugs.freedesktop.org/show_bug.cgi?id=21000>
    
    Signed-off-by: Tormod Volden <debian.tormod at gmail.com>
    Signed-off-by: Julien Cristau <jcristau at debian.org>

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index 64f7fe9..59b2bc8 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -155,6 +155,11 @@ static Bool quirk_detailed_v_in_cm (int scrnIndex, xf86MonPtr DDC)
 	DDC->vendor.prod_id == 13600)
 	return TRUE;
 
+    /* Bug #21000: LGPhilipsLCD LP154W01-TLAJ */
+    if (memcmp (DDC->vendor.name, "LPL", 4) == 0 &&
+	DDC->vendor.prod_id == 47360)
+	return TRUE;
+
     return FALSE;
 }