rpms/xorg-x11-drv-ati/devel radeon-6.6.1-no-dri-on-rn50.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.36, 1.37

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24463

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.6.1-no-dri-on-rn50.patch 
Log Message:
* Wed Aug  2 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-7.fc6
- Make sure DRI and Render accel are disabled on RN50.


radeon-6.6.1-no-dri-on-rn50.patch:
 radeon_driver.c |   13 +++++++++++++
 1 files changed, 13 insertions(+)

--- NEW FILE radeon-6.6.1-no-dri-on-rn50.patch ---
--- xf86-video-ati-6.6.1/src/radeon_driver.c.rn50-dri	2006-08-02 14:35:58.000000000 -0400
+++ xf86-video-ati-6.6.1/src/radeon_driver.c	2006-08-02 14:48:38.000000000 -0400
@@ -3015,6 +3015,12 @@
 #ifdef RENDER
     info->RenderAccel = xf86ReturnOptValBool (info->Options,
 					      OPTION_RENDER_ACCEL, TRUE);
+    if (info->Chipset == PCI_CHIP_RN50_515E ||
+	info->Chipset == PCI_CHIP_RN50_5969) {
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+		   "Render acceleration not supported on RN50\n");
+	info->RenderAccel = FALSE;
+    }
 #endif
 
     return TRUE;
@@ -4510,6 +4516,13 @@
     if (info->IsSecondary)
         return FALSE;
 
+    if (info->Chipset == PCI_CHIP_RN50_515E ||
+	info->Chipset == PCI_CHIP_RN50_5969) {
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+		   "Direct rendering not supported on RN50 or ES1000\n");
+	return FALSE;
+    }
+
     if (xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) {
 	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
 		   "[dri] Acceleration disabled, not initializing the DRI\n");


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xorg-x11-drv-ati.spec	29 Jul 2006 19:48:21 -0000	1.36
+++ xorg-x11-drv-ati.spec	2 Aug 2006 20:32:55 -0000	1.37
@@ -24,8 +24,11 @@
 Source2:   r128.xinf
 Source3:   radeon.xinf
 
+# Radeon patches (0-99)
 Patch0:    radeon-6.6.1-dotclock-filter.patch
-# Rage 128 patches
+Patch1:    radeon-6.6.1-no-dri-on-rn50.patch
+
+# Rage 128 patches (100-199)
 Patch100:  r128-missing-xf86ForceHWCursor-symbol-bug168753.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
@@ -46,6 +49,7 @@
 %setup -q -n %{tarball}-%{version}
 
 %patch0 -p1 -b .dotclock-filter
+%patch1 -p1 -b .rn50-dri
 %patch100 -p0 -b .r128-missing-xf86ForceHWCursor-symbol-bug168753
 
 %build
@@ -90,6 +94,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Wed Aug  2 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-7.fc6
+- Make sure DRI and Render accel are disabled on RN50.
+
 * Sat Jul 29 2006 Kristian Høgsberg <krh at redhat.com> 6.6.1-6.fc5.aiglx
 - Build for fc5 aiglx repo.