rpms/xorg-x11-drv-ati/devel radeon-6.9.0-bgnr-enable.patch, 1.1, 1.2 xorg-x11-drv-ati.spec, 1.180, 1.181 radeon-6.12.2-hax.patch, 1.1, NONE radeon-6.12.2-rs690-hack.patch, 1.1, NONE radeon-6.12.2-stable-branch.patch, 1.1, NONE radeon-kms-compat.patch, 1.2, NONE radeon-modeset-fixes.patch, 1.3, NONE radeon-modeset-still-more-fixes.patch, 1.1, NONE radeon-modeset.patch, 1.47, NONE radeon-src-readback-cpu.patch, 1.1, NONE

[Dave Airlie]

Author: airlied

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

Modified Files:
	radeon-6.9.0-bgnr-enable.patch xorg-x11-drv-ati.spec 
Removed Files:
	radeon-6.12.2-hax.patch radeon-6.12.2-rs690-hack.patch 
	radeon-6.12.2-stable-branch.patch radeon-kms-compat.patch 
	radeon-modeset-fixes.patch 
	radeon-modeset-still-more-fixes.patch radeon-modeset.patch 
	radeon-src-readback-cpu.patch 
Log Message:
* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 6.12.2-21
- ati: rebase to git master - need to fixup a few patches later


radeon-6.9.0-bgnr-enable.patch:
 radeon_kms.c |    3 +++
 1 file changed, 3 insertions(+)

Index: radeon-6.9.0-bgnr-enable.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-6.9.0-bgnr-enable.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- radeon-6.9.0-bgnr-enable.patch	29 Oct 2008 01:49:51 -0000	1.1
+++ radeon-6.9.0-bgnr-enable.patch	4 Aug 2009 05:55:26 -0000	1.2
@@ -1,14 +1,13 @@
-diff --git a/src/radeon_driver.c b/src/radeon_driver.c
-index 46fa59a..317942b 100644
---- a/src/radeon_driver.c
-+++ b/src/radeon_driver.c
-@@ -2762,6 +2762,9 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+diff -up xf86-video-ati-6.12.2/src/radeon_kms.c.da xf86-video-ati-6.12.2/src/radeon_kms.c
+--- xf86-video-ati-6.12.2/src/radeon_kms.c.da	2009-08-04 15:53:14.000000000 +1000
++++ xf86-video-ati-6.12.2/src/radeon_kms.c	2009-08-04 15:53:48.000000000 +1000
+@@ -331,6 +331,9 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn
+     if (pScrn->numEntities != 1) return FALSE;
+     if (!RADEONGetRec(pScrn)) return FALSE;
  
-     info->drm_mode_setting = radeon_kernel_mode_enabled(pScrn);
- 
-+    if (info->drm_mode_setting)
-+	pScrn->canDoBGNoneRoot = 1;
++    /* kms bg root enable */
++    pScrn->canDoBGNoneRoot = 1;
 +
+     info               = RADEONPTR(pScrn);
+     info->MMIO         = NULL;
      info->IsSecondary  = FALSE;
-     info->IsPrimary = FALSE;
- 


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.180
retrieving revision 1.181
diff -u -p -r1.180 -r1.181
--- xorg-x11-drv-ati.spec	27 Jul 2009 08:23:53 -0000	1.180
+++ xorg-x11-drv-ati.spec	4 Aug 2009 05:55:27 -0000	1.181
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.2
-Release:   20%{?dist}.1
+Release:   21%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -15,18 +15,10 @@ Source0:    http://www.x.org/pub/individ
 # unlike the other drivers, radeon.xinf is generated
 Source1:    mkxinf
 
-Patch0:	    radeon-6.12.2-stable-branch.patch
-Patch1:     radeon-modeset.patch
-Patch2:     radeon-modeset-fixes.patch
-Patch3:	    radeon-modeset-still-more-fixes.patch
+Patch0:     radeon-6.12.2-to-git.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
-Patch8:     radeon-src-readback-cpu.patch
-Patch9:     radeon-6.12.2-rs690-hack.patch
 Patch10:    radeon-6.12.2-lvds-default-modes.patch
-Patch11:    radeon-6.12.2-hax.patch
-Patch12:    radeon-kms-compat.patch
 Patch13:    fix-default-modes.patch
-Patch14:    radeon-powerpc-fix.patch
 
 ExcludeArch: s390 s390x
 
@@ -50,18 +42,10 @@ X.Org X11 ati video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .stable
-%patch1 -p1 -b .modeset
-%patch2 -p1 -b .modeset-fixes
-%patch3 -p1 -b .modeset-still-more-fixes
+%patch0 -p1 -b .git
 %patch6 -p1 -b .bgnr
-%patch8 -p1 -b .srcrb
-%patch9 -p1 -b .rs690
 %patch10 -p1 -b .lvds
-%patch11 -p1 -b .fixups
-%patch12 -p1 -b .compat
 %patch13 -p1 -b .def
-%patch14 -p1 -b .ppcfix
 
 %build
 autoreconf -iv
@@ -95,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 6.12.2-21
+- ati: rebase to git master - need to fixup a few patches later
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.12.2-20.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- radeon-6.12.2-hax.patch DELETED ---


--- radeon-6.12.2-rs690-hack.patch DELETED ---


--- radeon-6.12.2-stable-branch.patch DELETED ---


--- radeon-kms-compat.patch DELETED ---


--- radeon-modeset-fixes.patch DELETED ---


--- radeon-modeset-still-more-fixes.patch DELETED ---


--- radeon-modeset.patch DELETED ---


--- radeon-src-readback-cpu.patch DELETED ---