rpms/xorg-x11-drv-ati/devel radeon-modeset-fix-nomodeset.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.170, 1.171

[Dave Airlie]

Author: airlied

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

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-modeset-fix-nomodeset.patch 
Log Message:
* Tue Apr 07 2009 Dave Airlie <airlied at redhat.com> 6.12.1-7
- radeon-modeset-fix-nomodeset.patch: fix no modeset paths


radeon-modeset-fix-nomodeset.patch:

--- NEW FILE radeon-modeset-fix-nomodeset.patch ---
>From 982598d830691cd1b39e5aa2c9c409786e059fd3 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Tue, 7 Apr 2009 09:15:08 +1000
Subject: [PATCH] radeon: remove function

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

diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index 64b5937..347ab44 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -471,7 +471,6 @@ Bool radeon_update_dri_buffers(ScreenPtr pScreen)
     if (!success)
 	return FALSE;
 
-    radeon_update_sarea(pScrn, sarea);
     radeon_update_screen_private(pScrn, sarea);
     return TRUE;
 }
@@ -1707,8 +1706,6 @@ Bool RADEONDRIDoMappings(ScreenPtr pScreen)
 	return FALSE;
     }
     
-    radeon_update_sarea(pScrn, pSAREAPriv);
-    
 				/* DRIScreenInit adds the frame buffer
 				   map, but we need it as well */
     {
-- 
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.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- xorg-x11-drv-ati.spec	6 Apr 2009 08:48:25 -0000	1.170
+++ xorg-x11-drv-ati.spec	6 Apr 2009 23:33:34 -0000	1.171
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.1
-Release:   6%{?dist}
+Release:   7%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -16,6 +16,7 @@
 
 Patch0:     radeon-6.12.0-git-fixes.patch
 Patch1:     radeon-modeset.patch
+Patch2:     radeon-modeset-fix-nomodeset.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
@@ -42,6 +43,7 @@
 %setup -q -n %{tarball}-%{version}
 %patch0 -p1 -b .fixes
 %patch1 -p1 -b .modeset
+%patch2 -p1 -b .modeset-fix
 #patch4 -p1 -b .remove-limit-heuristics
 #%patch5 -p1 -b .panel-size
 %patch6 -p1 -b .bgnr
@@ -76,6 +78,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Apr 07 2009 Dave Airlie <airlied at redhat.com> 6.12.1-7
+- radeon-modeset-fix-nomodeset.patch: fix no modeset paths
+
 * Mon Apr 06 2009 Dave Airlie <airlied at redhat.com> 6.12.1-6
 - kms: add config.h to get mmap working properly