From a5308ceb127bf390cbe6fef3ba1e33e78f222ba1 Mon Sep 17 00:00:00 2001 From: Zhao Yakui Date: Fri, 20 Nov 2009 14:43:35 +0800 Subject: [PATCH] xfree86: Edid quirk for Philips LCD LP154W01 v1->v2: Make one condition case for one quirk instead of merging them together. This is based on the Keithp's suggestion. Move the EDID quirk for Philips LCD LP154W01 as the panel reports the vertical size in cm. https://bugs.freedesktop.org/show_bug.cgi?id=24482 Signed-off-by: Zhao Yakui Signed-off-by: Keith Packard (cherry picked from commit 19f7c15e2008dab3c46ba3e14dfa353d01c74f72) --- hw/xfree86/modes/xf86EdidModes.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c index 45e28dcf0..b057d7d49 100644 --- a/hw/xfree86/modes/xf86EdidModes.c +++ b/hw/xfree86/modes/xf86EdidModes.c @@ -160,6 +160,16 @@ static Bool quirk_detailed_v_in_cm (int scrnIndex, xf86MonPtr DDC) DDC->vendor.prod_id == 47360) return TRUE; + /* Bug #10304: LGPhilipsLCD LP154W01-A5 */ + if (memcmp(DDC->vendor.name, "LPL", 4) == 0 && + DDC->vendor.prod_id == 0) + return TRUE; + + /* Bug #24482: LGPhilipsLCD LP154W01-TLA1 */ + if (memcmp(DDC->vendor.name, "LPL", 4) == 0 && + DDC->vendor.prod_id == 0x2a00) + return TRUE; + /* Bug #21750: Samsung Syncmaster 2333HD */ if (memcmp (DDC->vendor.name, "SAM", 4) == 0 && DDC->vendor.prod_id == 1157) @@ -170,11 +180,6 @@ static Bool quirk_detailed_v_in_cm (int scrnIndex, xf86MonPtr DDC) static Bool quirk_detailed_use_maximum_size (int scrnIndex, xf86MonPtr DDC) { - /* Bug #10304: LGPhilipsLCD LP154W01-A5 */ - if (memcmp (DDC->vendor.name, "LPL", 4) == 0 && - (DDC->vendor.prod_id == 0 || DDC->vendor.prod_id == 0x2a00)) - return TRUE; - /* Bug #21324: Iiyama Vision Master 450 */ if (memcmp (DDC->vendor.name, "IVM", 4) == 0 && DDC->vendor.prod_id == 6400)