rpms/xorg-x11-server/F-11 xserver-1.6.1-pea-quirk.patch, NONE, 1.1 xorg-x11-server.spec, 1.448, 1.449

[Ben Skeggs]

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6074

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.1-pea-quirk.patch 
Log Message:
* Wed May 27 2009 Ben Skeggs <bskeggs at redhat.com> 1.6.1.901-3
- xserver-1.6.1-pea-quirk.patch: edid quirk for PEA prod 9003 (rh#492359)



xserver-1.6.1-pea-quirk.patch:

--- NEW FILE xserver-1.6.1-pea-quirk.patch ---
>From 8c4bcb5a2b9e99e16ade5b09f7b1f476be1dad55 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs at redhat.com>
Date: Wed, 27 May 2009 15:24:34 +1000
Subject: [PATCH] quirk: use first detailed timing as preferred for PEA prod 9003 (rh#492359)

---
 hw/xfree86/modes/xf86EdidModes.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index 54f2c65..54b410e 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -205,6 +205,11 @@ static Bool quirk_first_detailed_preferred (int scrnIndex, xf86MonPtr DDC)
 	DDC->vendor.prod_id == 2423)
 	return TRUE;
 
+    /* Peacock Ergovision 19.  See rh#492359 */
+    if (memcmp (DDC->vendor.name, "PEA", 4) == 0 &&
+	DDC->vendor.prod_id == 9003)
+	return TRUE;
+
     return FALSE;
 }
 
-- 
1.6.2.2



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -p -r1.448 -r1.449
--- xorg-x11-server.spec	25 May 2009 00:01:26 -0000	1.448
+++ xorg-x11-server.spec	27 May 2009 05:41:41 -0000	1.449
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.1.901
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -115,6 +115,8 @@ Patch6042: xserver-1.6.1-proc-cmdline.pa
 Patch6043: xserver-1.6.1-mousedrivers.patch
 # #456376, patch from upstream
 Patch6044: xserver-1.6.1-xkbsendmap.patch
+# #492359, monitor doesn't set first detailed timing preferred bit
+Patch6045: xserver-1.6.1-pea-quirk.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -532,6 +534,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed May 27 2009 Ben Skeggs <bskeggs at redhat.com> 1.6.1.901-3
+- xserver-1.6.1-pea-quirk.patch: edid quirk for PEA prod 9003 (rh#492359)
+
 * Mon May 25 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.1.901-2
 - xserver-1.6.1-mousedrivers.patch: treat other drivers as mouse drivers too
   when parsing the config file (complements xserver-1.6.1-synaptics.patch)