rpms/kernel/devel drm-nouveau.patch, 1.14, 1.15 kernel.spec, 1.1374, 1.1375

[Ben Skeggs]

Author: bskeggs

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

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Wed Mar 04 2009 Ben Skeggs <bskeggs at redhat.com>
- drm: fix bustage of _DRM_SHM maps


drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- drm-nouveau.patch	3 Mar 2009 10:01:14 -0000	1.14
+++ drm-nouveau.patch	4 Mar 2009 00:42:11 -0000	1.15
@@ -32,10 +32,10 @@
 +obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/
  
 diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
-index 325b4aa..25cf6a7 100644
+index 325b4aa..05e928f 100644
 --- a/drivers/gpu/drm/drm_bufs.c
 +++ b/drivers/gpu/drm/drm_bufs.c
-@@ -51,38 +51,23 @@ resource_size_t drm_get_resource_len(struct drm_device *dev, unsigned int resour
+@@ -51,38 +51,24 @@ resource_size_t drm_get_resource_len(struct drm_device *dev, unsigned int resour
  
  EXPORT_SYMBOL(drm_get_resource_len);
  
@@ -67,8 +67,10 @@
 -		default: /* Make gcc happy */
 -			;
 -		}
+-		if (entry->map->offset == map->offset)
 +
- 		if (entry->map->offset == map->offset)
++		if (entry->map->offset == map->offset ||
++		    (map->type == _DRM_SHM && map->flags & _DRM_CONTAINS_LOCK))
  			return entry;
  	}
  
@@ -78,7 +80,7 @@
  
  static int drm_map_handle(struct drm_device *dev, struct drm_hash_item *hash,
  			  unsigned long user_token, int hashed_handle, int shm)
-@@ -349,7 +334,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
+@@ -349,7 +335,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
  	/* We do it here so that dev->struct_mutex protects the increment */
  	user_token = (map->type == _DRM_SHM) ? (unsigned long)map->handle :
  		map->offset;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1374
retrieving revision 1.1375
diff -u -r1.1374 -r1.1375
--- kernel.spec	4 Mar 2009 00:09:55 -0000	1.1374
+++ kernel.spec	4 Mar 2009 00:42:12 -0000	1.1375
@@ -1792,6 +1792,9 @@
 # and build.
 
 %changelog
+* Wed Mar 04 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm: fix bustage of _DRM_SHM maps
+
 * Wed Mar 04 2009 Kyle McMartin <kyle at redhat.com>
 - Tony Breeds says CONFIG_GEF_SBC610 breaks USB. I, for one, believe
   him. Looks to be fairly useless anyway... (#486511)