rpms/kernel/F-10 drm-modesetting-radeon.patch, 1.63, 1.64 kernel.spec, 1.1167, 1.1168

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20909

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
- radeon: another AGP fix for r500 cards falling back to PCIE


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-modesetting-radeon.patch,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- drm-modesetting-radeon.patch	30 Nov 2008 08:32:10 -0000	1.63
+++ drm-modesetting-radeon.patch	30 Nov 2008 08:49:13 -0000	1.64
@@ -1,3 +1,9 @@
+commit 418897b8fb962076f8d7f95fe32b2aadcf7b1c7c
+Author: Dave Airlie <airlied at linux.ie>
+Date:   Sun Nov 30 18:45:58 2008 +1000
+
+    radeon: fixup AGP vs PCI/PCIE fallback for cards that need it
+
 commit 97bbdd07e8abe3172715a4e9403e84341fb240ec
 Author: Dave Airlie <airlied at linux.ie>
 Date:   Sun Nov 30 18:24:14 2008 +1000
@@ -24260,7 +24266,7 @@
 +	return NULL;
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
-index dcebb4b..c660898 100644
+index dcebb4b..7ecbe7a 100644
 --- a/drivers/gpu/drm/radeon/radeon_cp.c
 +++ b/drivers/gpu/drm/radeon/radeon_cp.c
 @@ -31,6 +31,7 @@
@@ -25920,7 +25926,7 @@
  	if (drm_device_is_agp(dev))
  		dev_priv->flags |= RADEON_IS_AGP;
  	else if (drm_device_is_pcie(dev))
-@@ -1751,9 +2730,25 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
+@@ -1751,9 +2730,32 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
  	else
  		dev_priv->flags |= RADEON_IS_PCI;
  
@@ -25934,8 +25940,15 @@
 +			radeon_agpmode = -1;
 +
 +		if (radeon_agpmode == -1) {
-+			DRM_INFO("Forcing AGP to PCI mode\n");
 +			dev_priv->flags &= ~RADEON_IS_AGP;
++			if (dev_priv->chip_family > CHIP_RV515 ||
++			    dev_priv->chip_family == CHIP_RV380) {
++				DRM_INFO("Forcing AGP to PCIE mode\n");
++				dev_priv->flags |= RADEON_IS_PCIE;
++			} else {
++				DRM_INFO("Forcing AGP to PCI mode\n");
++				dev_priv->flags |= RADEON_IS_PCI;
++			}
 +		}
 +	}
 +
@@ -25947,7 +25960,7 @@
  	if (ret != 0)
  		return ret;
  
-@@ -1763,28 +2758,122 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
+@@ -1763,28 +2765,122 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
  		return ret;
  	}
  
@@ -26081,7 +26094,7 @@
  
  	return 0;
  }
-@@ -1793,6 +2882,18 @@ int radeon_driver_unload(struct drm_device *dev)
+@@ -1793,6 +2889,18 @@ int radeon_driver_unload(struct drm_device *dev)
  {
  	drm_radeon_private_t *dev_priv = dev->dev_private;
  
@@ -26100,7 +26113,7 @@
  	DRM_DEBUG("\n");
  
  	drm_rmmap(dev, dev_priv->mmio);
-@@ -1802,3 +2903,63 @@ int radeon_driver_unload(struct drm_device *dev)
+@@ -1802,3 +2910,63 @@ int radeon_driver_unload(struct drm_device *dev)
  	dev->dev_private = NULL;
  	return 0;
  }


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1167
retrieving revision 1.1168
diff -u -r1.1167 -r1.1168
--- kernel.spec	30 Nov 2008 08:32:11 -0000	1.1167
+++ kernel.spec	30 Nov 2008 08:49:14 -0000	1.1168
@@ -1932,6 +1932,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sun Nov 30 2008 Dave Airlie <airlied at redhat.com> 2.6.27.7-132
+- radeon: another AGP fix for r500 cards falling back to PCIE
+
 * Sun Nov 30 2008 Dave Airlie <airlied at redhat.com> 2.6.27.7-131
 - radeon: fix card posting, module unload and radeon AGP issues