rpms/xorg-x11-server/devel xserver-1.5.0-quirk-acr.patch, NONE, 1.1 xorg-x11-server.spec, 1.323, 1.324

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30795

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.0-quirk-acr.patch 
Log Message:
* Wed Apr 09 2008 Dave Airlie <airlied at redhat.com> 1.4.99.901-20.20080407
- xserver-1.5.0-quirk-acr.patch - add quirk for another monitor.


xserver-1.5.0-quirk-acr.patch:

--- NEW FILE xserver-1.5.0-quirk-acr.patch ---
>From b19027fbaea4c3a146926e862983e0e3411fff3d Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at linux.ie>
Date: Wed, 9 Apr 2008 14:27:58 +1000
Subject: [PATCH] quirk: add quirk for ACR 640x350 default mode is wrong

RH #440186
---
 hw/xfree86/modes/xf86EdidModes.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index 8f7d45d..09d0039 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -93,6 +93,12 @@ static Bool quirk_prefer_large_60 (int scrnIndex, xf86MonPtr DDC)
 	DDC->vendor.prod_id == 638)
 	return TRUE;
 
+    /* Acer F51 */
+    if (memcmp (DDC->vendor.name, "API", 4) == 0 &&
+	DDC->vendor.prod_id == 0x7602)
+	return TRUE;
+
+
     return FALSE;
 }
 
-- 
1.5.4.1



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- xorg-x11-server.spec	8 Apr 2008 20:59:51 -0000	1.323
+++ xorg-x11-server.spec	9 Apr 2008 04:41:00 -0000	1.324
@@ -20,7 +20,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.901
-Release:   19.%{gitdate}%{?dist}
+Release:   20.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -52,7 +52,7 @@
 Patch2013:  xserver-1.4.99-document-fontpath-correctly.patch
 
 # Trivial things to maybe merge upstream at next rebase
-#Patch4000:
+Patch4000: xserver-1.5.0-quirk-acr.patch
 
 # Trivial things to never merge upstream ever
 # Don't merge this without protecting the gccisms.
@@ -513,6 +513,9 @@
 
 
 %changelog
+* Wed Apr 09 2008 Dave Airlie <airlied at redhat.com> 1.4.99.901-20.20080407
+- xserver-1.5.0-quirk-acr.patch - add quirk for another monitor.
+
 * Tue Apr 08 2008 Adam Jackson <ajax at redhat.com> 1.4.99.901-19.20080407
 - Today's rebase.  Patch merge, some int10 fixes.