rpms/xorg-x11-drv-ati/devel radeon-enable-dfs.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.171, 1.172

[Dave Airlie]

Author: airlied

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

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-enable-dfs.patch 
Log Message:
* Tue Apr 07 2009 Dave Airlie <airlied at redhat.com> 6.12.1-8
- re-enable DFS for kms


radeon-enable-dfs.patch:

--- NEW FILE radeon-enable-dfs.patch ---
>From add7f96a096ac2403aae259a5a457137207015d4 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Tue, 7 Apr 2009 10:48:48 +1000
Subject: [PATCH] radeon: mismerge accel dfs only if we have non-agp

---
 src/radeon_driver.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 1c9d5d9..3808c34 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3622,9 +3622,6 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
 	    info->accelDFS = xf86ReturnOptValBool(info->Options, OPTION_ACCEL_DFS,
                                                   info->cardType != CARD_AGP);
 
-	    if (info->drm_mm)
-	      info->accelDFS = FALSE;
-
 	    /* Reserve approx. half of offscreen memory for local textures by
 	     * default, can be overridden with Option "FBTexPercent".
 	     * Round down to a whole number of texture regions.
-- 
1.6.2



Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- xorg-x11-drv-ati.spec	6 Apr 2009 23:33:34 -0000	1.171
+++ xorg-x11-drv-ati.spec	7 Apr 2009 00:54:17 -0000	1.172
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.1
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -17,6 +17,7 @@
 Patch0:     radeon-6.12.0-git-fixes.patch
 Patch1:     radeon-modeset.patch
 Patch2:     radeon-modeset-fix-nomodeset.patch
+Patch3:     radeon-enable-dfs.patch
 #Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
 Patch5:	    radeon-6.9.0-panel-size-sanity.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
@@ -44,6 +45,7 @@
 %patch0 -p1 -b .fixes
 %patch1 -p1 -b .modeset
 %patch2 -p1 -b .modeset-fix
+%patch3 -p1 -b .kms-dfs
 #patch4 -p1 -b .remove-limit-heuristics
 #%patch5 -p1 -b .panel-size
 %patch6 -p1 -b .bgnr
@@ -78,6 +80,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Apr 07 2009 Dave Airlie <airlied at redhat.com> 6.12.1-8
+- re-enable DFS for kms
+
 * Tue Apr 07 2009 Dave Airlie <airlied at redhat.com> 6.12.1-7
 - radeon-modeset-fix-nomodeset.patch: fix no modeset paths