* Thu Mar 27 2008 Dave Airlie <airlied@redhat.com> 1.4.99.901-12.20080314

- xserver-1.5.0-fix-lsl-quirk.patch - fix the LSL quirk (#435216)
This commit is contained in:
Dave Airlie 2008-03-27 05:24:12 +00:00
parent 1a87a54d6c
commit d15d772aa0
2 changed files with 49 additions and 2 deletions

View File

@ -20,7 +20,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.4.99.901 Version: 1.4.99.901
Release: 11.%{gitdate}%{?dist} Release: 12.%{gitdate}%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
Group: User Interface/X 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 Patch5008: xserver-1.5.0-xaa-sucks.patch
Patch5009: xserver-1.5.0-no-evdev-keyboards-kthnx.patch Patch5009: xserver-1.5.0-no-evdev-keyboards-kthnx.patch
Patch5010: xserver-1.5.0-vmmouse.patch Patch5010: xserver-1.5.0-vmmouse.patch
Patch5011: xserver-1.5.0-fix-lsl-quirk.patch
%define moduledir %{_libdir}/xorg/modules %define moduledir %{_libdir}/xorg/modules
%define drimoduledir %{_libdir}/dri %define drimoduledir %{_libdir}/dri
@ -514,7 +515,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Wed Mar 26 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-10.20080314 * Thu Mar 27 2008 Dave Airlie <airlied@redhat.com> 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 <ajax@redhat.com> 1.4.99.901-11.20080314
- xserver-1.5.0-vmmouse.patch: Use vmmouse(4) for the automagic mouse - 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 section. It'll just fall back to the mouse(4) driver anyway if it's
not a vmmouse. not a vmmouse.

View File

@ -0,0 +1,43 @@
From c747030a49dd289e873e2b686cd129d840e55468 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
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