rpms/kernel/F-10 drm-modesetting-radeon.patch, 1.74, 1.75 kernel.spec, 1.1281, 1.1282

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
Fix up drm-modesetting-radeon so it applies.

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.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- drm-modesetting-radeon.patch	3 Mar 2009 16:14:45 -0000	1.74
+++ drm-modesetting-radeon.patch	3 Mar 2009 16:19:23 -0000	1.75
@@ -4965,7 +4965,7 @@
 +				dev->sigdata.lock = &dev->default_lock;
 +			master->lock.hw_lock = &dev->default_lock;
  			master->lock.file_priv = NULL;
- 			wake_up_interruptible(&master->lock.lock_queue);
+ 			wake_up_interruptible_all(&master->lock.lock_queue);
  		}
 @@ -481,6 +481,9 @@ int drm_rmmap_locked(struct drm_device *dev, struct drm_local_map *map)
  	case _DRM_GEM:
@@ -5691,7 +5691,16 @@
  	mutex_lock(&dev->struct_mutex);
  
  	if (file_priv->is_master) {
-@@ -500,6 +504,7 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -501,7 +501,7 @@ int drm_release(struct inode *inode, str
+ 		 * possibility to lock.
+ 		 */
+ 
+-		if (master->lock.hw_lock) {
++		if (master->lock.hw_lock != &dev->default_lock) {
+ 			if (dev->sigdata.lock == master->lock.hw_lock)
+ 				dev->sigdata.lock = NULL;
+ 			master->lock.hw_lock = NULL;
+@@ -510,6 +514,7 @@ int drm_release(struct inode *inode, struct file *filp)
  	/* drop the reference held my the file priv */
  	drm_master_put(&file_priv->master);
  	file_priv->is_master = 0;
@@ -5836,15 +5845,6 @@
  
  	list_add_tail(&master->head, &minor->master_list);
  
-@@ -147,7 +148,7 @@ static void drm_master_destroy(struct kref *kref)
- 
- 	drm_ht_remove(&master->magiclist);
- 
--	if (master->lock.hw_lock) {
-+	if (master->lock.hw_lock != &dev->default_lock) {
- 		if (dev->sigdata.lock == master->lock.hw_lock)
- 			dev->sigdata.lock = NULL;
- 		master->lock.hw_lock = NULL;
 @@ -210,6 +211,7 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
  	init_timer(&dev->timer);
  	mutex_init(&dev->struct_mutex);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1281
retrieving revision 1.1282
diff -u -r1.1281 -r1.1282
--- kernel.spec	3 Mar 2009 16:14:46 -0000	1.1281
+++ kernel.spec	3 Mar 2009 16:19:23 -0000	1.1282
@@ -1767,6 +1767,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Mar 03 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.52.rc6.git7
+- Fix up drm-modesetting-radeon so it applies.
+
 * Tue Mar 03 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.51.rc6.git7
 - Linux 2.6.29-rc6-git7
 - Copy drm-modesetting-radeon from rawhide (it does not apply cleanly.)