rpms/kernel/F-10 drm-modesetting-radeon.patch,1.53,1.54

[Dave Airlie]

Author: airlied

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

Modified Files:
	drm-modesetting-radeon.patch 
Log Message:
radeon: fix harder


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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- drm-modesetting-radeon.patch	11 Nov 2008 21:37:58 -0000	1.53
+++ drm-modesetting-radeon.patch	11 Nov 2008 23:02:35 -0000	1.54
@@ -1,8 +1,20 @@
-commit 9be60396ec90ded78a2b3f78b7df09a1af98ba18
-Author: Dave Airlie <airlied at linux.ie>
-Date:   Wed Nov 12 07:35:38 2008 +1000
+commit e261a38b6b15313472342ad38cf3eadbd67314f3
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Nov 12 09:01:14 2008 +1000
+
+    radeon: fix more build
+
+commit a87d5050fab6cfb136ef986cc9800daaee141e1e
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Nov 12 08:59:04 2008 +1000
 
-    i915: sarea/priv no longer here
+    radeon: fix compile
+
+commit 1f5619f3b1f9619fecb4091348bfefc1d398e2bb
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Nov 12 08:58:55 2008 +1000
+
+    i915: fix master bits
 
 commit cc1c0d62e450d2feacc623f6a7139e2b5b5d89f7
 Author: Dave Airlie <airlied at redhat.com>
@@ -24059,7 +24071,7 @@
 +	return NULL;
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
-index abdc1ae..64498b1 100644
+index abdc1ae..7c206f3 100644
 --- a/drivers/gpu/drm/radeon/radeon_cp.c
 +++ b/drivers/gpu/drm/radeon/radeon_cp.c
 @@ -31,6 +31,7 @@
@@ -25663,7 +25675,7 @@
  	if (drm_device_is_agp(dev))
  		dev_priv->flags |= RADEON_IS_AGP;
  	else if (drm_device_is_pcie(dev))
-@@ -1751,29 +2690,135 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
+@@ -1751,29 +2690,137 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
  	else
  		dev_priv->flags |= RADEON_IS_PCI;
  
@@ -25795,6 +25807,8 @@
 -	int ret;
 -	drm_local_map_t *map;
  	drm_radeon_private_t *dev_priv = dev->dev_private;
++	drm_local_map_t *map;
++	int ret;
  
  	dev_priv->gart_info.table_size = RADEON_PCIGART_TABLE_SIZE;
  
@@ -25805,7 +25819,7 @@
  	ret = drm_addmap(dev, dev_priv->fb_aper_offset,
  			 drm_get_resource_len(dev, 0), _DRM_FRAME_BUFFER,
  			 _DRM_WRITE_COMBINING, &map);
-@@ -1787,6 +2832,18 @@ int radeon_driver_unload(struct drm_device *dev)
+@@ -1787,6 +2834,18 @@ int radeon_driver_unload(struct drm_device *dev)
  {
  	drm_radeon_private_t *dev_priv = dev->dev_private;
  
@@ -25824,7 +25838,7 @@
  	DRM_DEBUG("\n");
  
  	drm_rmmap(dev, dev_priv->mmio);
-@@ -1796,3 +2853,58 @@ int radeon_driver_unload(struct drm_device *dev)
+@@ -1796,3 +2855,58 @@ int radeon_driver_unload(struct drm_device *dev)
  	dev->dev_private = NULL;
  	return 0;
  }