From 99e86301ffce8c3fc036b4cf7efb3e8a652ae45f Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mar 27 2008 05:24:12 +0000 Subject: * Thu Mar 27 2008 Dave Airlie 1.4.99.901-12.20080314 - xserver-1.5.0-fix-lsl-quirk.patch - fix the LSL quirk (#435216) --- diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index f53337f..6f1d7ec 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -20,7 +20,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.4.99.901 -Release: 11.%{gitdate}%{?dist} +Release: 12.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -66,6 +66,7 @@ Patch5007: xserver-1.5.0-bad-fbdev-thats-mine.patch Patch5008: xserver-1.5.0-xaa-sucks.patch Patch5009: xserver-1.5.0-no-evdev-keyboards-kthnx.patch Patch5010: xserver-1.5.0-vmmouse.patch +Patch5011: xserver-1.5.0-fix-lsl-quirk.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -514,7 +515,10 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Mar 26 2008 Adam Jackson 1.4.99.901-10.20080314 +* Thu Mar 27 2008 Dave Airlie 1.4.99.901-12.20080314 +- xserver-1.5.0-fix-lsl-quirk.patch - fix the LSL quirk (#435216) + +* Wed Mar 26 2008 Adam Jackson 1.4.99.901-11.20080314 - xserver-1.5.0-vmmouse.patch: Use vmmouse(4) for the automagic mouse section. It'll just fall back to the mouse(4) driver anyway if it's not a vmmouse. diff --git a/xserver-1.5.0-fix-lsl-quirk.patch b/xserver-1.5.0-fix-lsl-quirk.patch new file mode 100644 index 0000000..274d3ca --- /dev/null +++ b/xserver-1.5.0-fix-lsl-quirk.patch @@ -0,0 +1,43 @@ +From c747030a49dd289e873e2b686cd129d840e55468 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Thu, 27 Mar 2008 15:18:39 +1000 +Subject: [PATCH] quirk: fix LPL monitors properly. + +no point having a h cm fix when we really want to copy the sizes from the +other place. + +RH BZ 435216 +--- + hw/xfree86/modes/xf86EdidModes.c | 9 +-------- + 1 files changed, 1 insertions(+), 8 deletions(-) + +diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c +index 2d1a6ab..777bb70 100644 +--- a/hw/xfree86/modes/xf86EdidModes.c ++++ b/hw/xfree86/modes/xf86EdidModes.c +@@ -108,13 +108,6 @@ static Bool quirk_prefer_large_75 (int scrnIndex, xf86MonPtr DDC) + + static Bool quirk_detailed_h_in_cm (int scrnIndex, xf86MonPtr DDC) + { +- /* Bug #10304: "LGPhilipsLCD LP154W01-A5" */ +- /* Bug #12784: "LGPhilipsLCD LP154W01-TLA2" */ +- /* Red Hat #435216 "LGPhilipsLCD LP154W01-TLAE" */ +- if (memcmp (DDC->vendor.name, "LPL", 4) == 0 && +- (DDC->vendor.prod_id == 0 || DDC->vendor.prod_id == 0x2a00)) +- return TRUE; +- + /* Bug #11603: Funai Electronics PM36B */ + if (memcmp (DDC->vendor.name, "FCM", 4) == 0 && + DDC->vendor.prod_id == 13600) +@@ -137,7 +130,7 @@ 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 == 0 || DDC->vendor.prod_id == 0x2a00)) + return TRUE; + + return FALSE; +-- +1.5.3.7 +