rpms/xorg-x11-drv-ati/devel radeon-6.7.194-disable-rc410-dri.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.61, 1.62

[Dave Airlie (airlied)]

Author: airlied

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

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.7.194-disable-rc410-dri.patch 
Log Message:
* Fri Sep 28 2007 Dave Airlie <airlied at redhat.com> 6.7.194-2
- radeon-6.7.194-disable-rc410-dri.patch - Disable DRI on
  RC410 by default as it seems to need some more work.


radeon-6.7.194-disable-rc410-dri.patch:

--- NEW FILE radeon-6.7.194-disable-rc410-dri.patch ---
>From d808781d48adf01e80b5bb476bae2d2f599030f1 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Fri, 28 Sep 2007 14:50:42 +1000
Subject: [PATCH] rc410: disable DRI by default due to it not working

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

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 89254d3..a8a3d39 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2026,15 +2026,17 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn)
     info->pKernelDRMVersion = NULL;
 
     if (info->Chipset == PCI_CHIP_RN50_515E ||
-	info->Chipset == PCI_CHIP_RN50_5969) {
+	info->Chipset == PCI_CHIP_RN50_5969 ||
+	info->Chipset == PCI_CHIP_RC410_5A61 ||
+	info->Chipset == PCI_CHIP_RC410_5A62) {
     	if (xf86ReturnOptValBool(info->Options, OPTION_DRI, FALSE)) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		"Direct rendering for RN50 forced on -- "
+		"Direct rendering for RN50/RC410 forced on -- "
 		"This is NOT officially supported at the hardware level "
 		"and may cause instability or lockups\n");
     	} else {
 	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		"Direct rendering not officially supported on RN50\n");
+		"Direct rendering not officially supported on RN50/RC410\n");
 	    return FALSE;
 	}
     }
-- 
1.5.2.4



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.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- xorg-x11-drv-ati.spec	24 Sep 2007 04:34:48 -0000	1.61
+++ xorg-x11-drv-ati.spec	28 Sep 2007 05:07:00 -0000	1.62
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.7.194
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -18,6 +18,7 @@
 
 # Radeon patches (0-99)
 Patch2:     radeon-6.6.3-renderaccel-buglet.patch
+Patch3:     radeon-6.7.194-disable-rc410-dri.patch
 
 # Rage 128 patches (100-199)
 
@@ -41,6 +42,7 @@
 %setup -q -n %{tarball}-%{version}
 
 %patch2 -p1 -b .renderaccel
+%patch3 -p1 -b .rc410dri
 
 %build
 %configure --disable-static
@@ -81,6 +83,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Sep 28 2007 Dave Airlie <airlied at redhat.com> 6.7.194-2
+- radeon-6.7.194-disable-rc410-dri.patch - Disable DRI on
+  RC410 by default as it seems to need some more work.
+
 * Mon Sep 24 2007 Dave Airlie <airlied at redhat.com> 6.7.194-1
 - xf86-video-ati 6.7.194