rpms/kernel/F-11 drm-nouveau.patch, 1.48, 1.49 kernel.spec, 1.1592, 1.1593

[Ben Skeggs]

Author: bskeggs

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

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Thu May 07 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.2-131
- drm-nouveau.patch: fix bar1 mtrr size



drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- drm-nouveau.patch	6 May 2009 03:12:03 -0000	1.48
+++ drm-nouveau.patch	7 May 2009 00:50:34 -0000	1.49
@@ -13915,7 +13915,7 @@ index 0000000..44b3b34
 +
 +	/* setup a mtrr over the FB */
 +	dev_priv->fb_mtrr = drm_mtrr_add(drm_get_resource_start(dev, 1),
-+					 nouveau_mem_fb_amount(dev),
++					 drm_get_resource_len(dev, 1),
 +					 DRM_MTRR_WC);
 +
 +	if (dev_priv->card_type >= NV_50) {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1592
retrieving revision 1.1593
diff -u -p -r1.1592 -r1.1593
--- kernel.spec	6 May 2009 14:34:07 -0000	1.1592
+++ kernel.spec	7 May 2009 00:50:35 -0000	1.1593
@@ -1967,6 +1967,9 @@ fi
 # and build.
 
 %changelog
+* Thu May 07 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.2-131
+- drm-nouveau.patch: fix bar1 mtrr size
+
 * Wed May 06 2009 John W. Linville <linville at redhat.com> 2.6.29.2-130
 - back-port ath9k: Fix FIF_BCN_PRBRESP_PROMISC handling