rpms/xorg-x11-drv-ati/devel radeon-6.9.0-quirk-agp.patch,1.1,1.2

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7721

Modified Files:
	radeon-6.9.0-quirk-agp.patch 
Log Message:
arrrgh fuzz


radeon-6.9.0-quirk-agp.patch:

Index: radeon-6.9.0-quirk-agp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-6.9.0-quirk-agp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- radeon-6.9.0-quirk-agp.patch	29 Oct 2008 05:59:58 -0000	1.1
+++ radeon-6.9.0-quirk-agp.patch	29 Oct 2008 06:07:13 -0000	1.2
@@ -1,16 +1,6 @@
-commit 937b7ac2a259cf504a19dcf62a58b1db1afb8eb9
-Author: Bryce Harrington <bryce at canonical.com>
-Date:   Wed Oct 29 01:31:50 2008 -0400
-
-    Add AGP quirk table
-    
-    - set known good default agp modes for problematic chip/bridge combos
-    - should fix bug 17360, others
-
-diff --git a/src/atipciids.h b/src/atipciids.h
-index f24f8fb..7735e93 100644
---- a/src/atipciids.h
-+++ b/src/atipciids.h
+diff -up xf86-video-ati-6.9.0/src/atipciids.h.dave xf86-video-ati-6.9.0/src/atipciids.h
+--- xf86-video-ati-6.9.0/src/atipciids.h.dave	2008-02-19 00:41:27.000000000 +1000
++++ xf86-video-ati-6.9.0/src/atipciids.h	2008-10-29 16:04:14.000000000 +1000
 @@ -35,8 +35,11 @@
  
  /* PCI Vendor */
@@ -23,12 +13,11 @@
  
  #include "ati_pciids_gen.h"
  
-diff --git a/src/radeon_dri.c b/src/radeon_dri.c
-index 5542d2b..cb7df2c 100644
---- a/src/radeon_dri.c
-+++ b/src/radeon_dri.c
-@@ -719,6 +719,41 @@ static void RADEONDRIInitGARTValues(RADEONInfoPtr info)
-     info->dri->log2GARTTexGran  = l;
+diff -up xf86-video-ati-6.9.0/src/radeon_dri.c.dave xf86-video-ati-6.9.0/src/radeon_dri.c
+--- xf86-video-ati-6.9.0/src/radeon_dri.c.dave	2008-10-29 16:03:59.000000000 +1000
++++ xf86-video-ati-6.9.0/src/radeon_dri.c	2008-10-29 16:04:14.000000000 +1000
+@@ -868,6 +868,41 @@ static void RADEONDRIInitGARTValues(RADE
+ 
  }
  
 +/* AGP Mode Quirk List - Certain hostbridge/gfx-card combos don't work with
@@ -69,7 +58,7 @@
  /* Set AGP transfer mode according to requests and constraints */
  static Bool RADEONSetAgpMode(RADEONInfoPtr info, ScreenPtr pScreen)
  {
-@@ -741,6 +776,21 @@ static Bool RADEONSetAgpMode(RADEONInfoPtr info, ScreenPtr pScreen)
+@@ -890,6 +925,21 @@ static Bool RADEONSetAgpMode(RADEONInfoP
  	else defaultMode = 1;
      }