From 4ec0184d9ce54bb247e17f5b1cfb234c1ea1072a Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@fedoraproject.org>
Date: May 27 2009 05:41:41 +0000
Subject: * Wed May 27 2009 Ben Skeggs <bskeggs@redhat.com> 1.6.1.901-3

- xserver-1.6.1-pea-quirk.patch: edid quirk for PEA prod 9003 (rh#492359)

---

diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 410f3d3..70c5231 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -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.patch
 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@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@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)
diff --git a/xserver-1.6.1-pea-quirk.patch b/xserver-1.6.1-pea-quirk.patch
new file mode 100644
index 0000000..6382aa8
--- /dev/null
+++ b/xserver-1.6.1-pea-quirk.patch
@@ -0,0 +1,28 @@
+From 8c4bcb5a2b9e99e16ade5b09f7b1f476be1dad55 Mon Sep 17 00:00:00 2001
+From: Ben Skeggs <bskeggs@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
+