rpms/kernel/devel config-generic, 1.247, 1.248 drm-nouveau.patch, 1.11, 1.12 kernel.spec, 1.1349, 1.1350

[Kyle McMartin]

Author: kyle

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

Modified Files:
	config-generic drm-nouveau.patch kernel.spec 
Log Message:
* Fri Feb 27 2009 Kyle McMartin <kyle at redhat.com>
- fixt drm-nouveau for drm-next.



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- config-generic	25 Feb 2009 18:32:04 -0000	1.247
+++ config-generic	27 Feb 2009 07:03:54 -0000	1.248
@@ -2174,6 +2174,7 @@
 CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_VIA=m
 CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_NOUVEAU_KMS=y
 
 #
 # PCMCIA character devices

drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- drm-nouveau.patch	27 Feb 2009 06:12:48 -0000	1.11
+++ drm-nouveau.patch	27 Feb 2009 07:03:54 -0000	1.12
@@ -31,47 +31,6 @@
  obj-$(CONFIG_DRM_VIA)	+=via/
 +obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/
  
-diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
-index 19039d8..d5718bb 100644
---- a/drivers/gpu/drm/drm_bufs.c
-+++ b/drivers/gpu/drm/drm_bufs.c
-@@ -49,8 +49,8 @@ unsigned long drm_get_resource_len(struct drm_device *dev, unsigned int resource
- 
- EXPORT_SYMBOL(drm_get_resource_len);
- 
--static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
--					     drm_local_map_t *map)
-+struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
-+					   drm_local_map_t *map)
- {
- 	struct drm_map_list *entry;
- 	list_for_each_entry(entry, &dev->maplist, head) {
-@@ -63,6 +63,7 @@ static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
- 
- 	return NULL;
- }
-+EXPORT_SYMBOL(drm_find_matching_map);
- 
- static int drm_map_handle(struct drm_device *dev, struct drm_hash_item *hash,
- 			  unsigned long user_token, int hashed_handle)
-diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
-index c6ade45..969b372 100644
---- a/drivers/gpu/drm/drm_drv.c
-+++ b/drivers/gpu/drm/drm_drv.c
-@@ -327,11 +327,10 @@ static void drm_cleanup(struct drm_device * dev)
- 		dev->agp = NULL;
- 	}
- 
--	drm_ht_remove(&dev->map_hash);
--	drm_ctxbitmap_cleanup(dev);
--
- 	list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head)
- 		drm_rmmap(dev, r_list->map);
-+	drm_ht_remove(&dev->map_hash);
-+	drm_ctxbitmap_cleanup(dev);
- 
- 	if (drm_core_check_feature(dev, DRIVER_MODESET))
- 		drm_put_minor(&dev->control);
 diff --git a/drivers/gpu/drm/drm_fence.c b/drivers/gpu/drm/drm_fence.c
 index f1c386c..fd62fd9 100644
 --- a/drivers/gpu/drm/drm_fence.c
@@ -43085,3 +43044,42 @@
 +#define DRM_NOUVEAU_GEM_TILE           0x48
 +
 +#endif /* __NOUVEAU_DRM_H__ */
+diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
+index 445c762..a528dc9 100644
+--- a/drivers/gpu/drm/drm_bufs.c
++++ b/drivers/gpu/drm/drm_bufs.c
+@@ -51,7 +51,7 @@ resource_size_t drm_get_resource_len(struct drm_device *dev, unsigned int resour
+ 
+ EXPORT_SYMBOL(drm_get_resource_len);
+ 
+-static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
++struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
+ 						  struct drm_local_map *map)
+ {
+ 	struct drm_map_list *entry;
+@@ -83,6 +83,7 @@ static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
+ 
+ 	return NULL;
+ }
++EXPORT_SYMBOL(drm_find_matching_map);
+ 
+ static int drm_map_handle(struct drm_device *dev, struct drm_hash_item *hash,
+ 			  unsigned long user_token, int hashed_handle, int shm)
+diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
+index 7c41600..82b0731 100644
+--- a/drivers/gpu/drm/drm_stub.c
++++ b/drivers/gpu/drm/drm_stub.c
+@@ -501,11 +501,10 @@ void drm_put_dev(struct drm_device *dev)
+ 		dev->agp = NULL;
+ 	}
+ 
+-	drm_ht_remove(&dev->map_hash);
+-	drm_ctxbitmap_cleanup(dev);
+-
+ 	list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head)
+ 		drm_rmmap(dev, r_list->map);
++	drm_ht_remove(&dev->map_hash);
++	drm_ctxbitmap_cleanup(dev);
+ 
+ 	if (drm_core_check_feature(dev, DRIVER_MODESET))
+ 		drm_put_minor(&dev->control);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1349
retrieving revision 1.1350
diff -u -r1.1349 -r1.1350
--- kernel.spec	27 Feb 2009 06:47:23 -0000	1.1349
+++ kernel.spec	27 Feb 2009 07:03:55 -0000	1.1350
@@ -1788,6 +1788,9 @@
 # and build.
 
 %changelog
+* Fri Feb 27 2009 Kyle McMartin <kyle at redhat.com>
+- fixt drm-nouveau for drm-next.
+
 * Fri Feb 27 2009 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.29-rc6-git4