rpms/kernel/F-11 drm-nouveau.patch, 1.56, 1.57 kernel.spec, 1.1662, 1.1663

[Ben Skeggs]

Author: bskeggs

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

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Mon Jun 26 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.5-201
- nouveau: bump timeout up a bit, some people hitting false hangs



drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- drm-nouveau.patch	29 Jun 2009 06:06:48 -0000	1.56
+++ drm-nouveau.patch	29 Jun 2009 06:15:34 -0000	1.57
@@ -7296,7 +7296,7 @@ index 0000000..578983e
 +MODULE_LICENSE("GPL and additional rights");
 diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
 new file mode 100644
-index 0000000..1140522
+index 0000000..6f63693
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
 @@ -0,0 +1,836 @@
@@ -8049,7 +8049,7 @@ index 0000000..1140522
 +#define nv_wr16(reg,val) nv_out16(mmio, (reg), (val))
 +#define nv_rd08(reg) nv_in08(mmio, (reg))
 +#define nv_wr08(reg,val) nv_out08(mmio, (reg), (val))
-+#define nv_wait(reg,mask,val) nouveau_wait_until(dev, 1000000000ULL, (reg),    \
++#define nv_wait(reg,mask,val) nouveau_wait_until(dev, 2000000000ULL, (reg),    \
 +						 (mask), (val))
 +
 +/* VRAM access */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1662
retrieving revision 1.1663
diff -u -p -r1.1662 -r1.1663
--- kernel.spec	29 Jun 2009 06:06:49 -0000	1.1662
+++ kernel.spec	29 Jun 2009 06:15:34 -0000	1.1663
@@ -2073,9 +2073,12 @@ fi
 # and build.
 
 %changelog
+* Mon Jun 26 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.5-201
+- nouveau: bump timeout up a bit, some people hitting false hangs
+
 * Mon Jun 26 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.5-200
 - nouveau: backport nv50 output script fixes from upstream
-'
+
 * Mon Jun 26 2009 Ben Skeggs <bskeggs at redhat.com>
 - nouveau: fix GT200 context control, will allow use of 3D engine now