rpms/kernel/devel drm-modesetting-radeon.patch, 1.57, 1.58 kernel.spec, 1.1346, 1.1347

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19057

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
* Fri Feb 27 2009 Dave Airlie <airlied at redhat.com>
- radeon: disable r600 kms by default - we want accel to work


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- drm-modesetting-radeon.patch	27 Feb 2009 03:05:19 -0000	1.57
+++ drm-modesetting-radeon.patch	27 Feb 2009 05:42:11 -0000	1.58
@@ -1,3 +1,9 @@
+commit 1f756299d935d5a0a4beb82ddeaf0e4b2935861a
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Feb 27 15:37:14 2009 +1000
+
+    radeon: disable kms by default for r600
+
 commit e92784bff2fee17c8e47f11753343d99500784a6
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Feb 27 11:51:22 2009 +1000
@@ -17856,7 +17862,7 @@
 +	return NULL;
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
-index 15cfe56..21fe15c 100644
+index 15cfe56..cead67d 100644
 --- a/drivers/gpu/drm/radeon/radeon_cp.c
 +++ b/drivers/gpu/drm/radeon/radeon_cp.c
 @@ -46,8 +46,12 @@ static void radeon_do_cp_start(drm_radeon_private_t * dev_priv);
@@ -19529,7 +19535,7 @@
 + 	 * until we have a mesa driver in place
 + 	 */
 +	if (radeon_modeset == -1) {
-+		if (dev_priv->chip_family <= CHIP_RV280) {
++		if ((dev_priv->chip_family <= CHIP_RV280) || (dev_priv->chip_family >= CHIP_R600)) {
 +			dev->driver->driver_features &= ~DRIVER_MODESET;
 +			drm_put_minor(&dev->control);
 +			radeon_modeset = 0;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1346
retrieving revision 1.1347
diff -u -r1.1346 -r1.1347
--- kernel.spec	27 Feb 2009 05:23:03 -0000	1.1346
+++ kernel.spec	27 Feb 2009 05:42:11 -0000	1.1347
@@ -1788,6 +1788,9 @@
 # and build.
 
 %changelog
+* Fri Feb 27 2009 Dave Airlie <airlied at redhat.com>
+- radeon: disable r600 kms by default - we want accel to work
+
 * Fri Feb 27 2009 Ben Skeggs <bskeggs at redhat.com>
 - Bring in nouveau update
   - "getting there" nv50 modesetting rework