rpms/kernel/F-11 drm-nouveau.patch, 1.44, 1.45 kernel.spec, 1.1588, 1.1589

[Ben Skeggs]

Author: bskeggs

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

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Tue May 05 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.2-127
- drm-nouveau.patch: bump dac load detection delay to match ddx



drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- drm-nouveau.patch	3 May 2009 02:25:34 -0000	1.44
+++ drm-nouveau.patch	4 May 2009 22:44:10 -0000	1.45
@@ -23842,7 +23842,7 @@ index 0000000..87c6213
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_connector.c b/drivers/gpu/drm/nouveau/nv50_connector.c
 new file mode 100644
-index 0000000..a83ee1b
+index 0000000..771c7ab
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_connector.c
 @@ -0,0 +1,498 @@
@@ -24184,7 +24184,7 @@ index 0000000..a83ee1b
 +			if (!obj)
 +				continue;
 +			encoder = to_nouveau_encoder(obj_to_encoder(obj));
-+			NV_ERROR(dev, " %d: %d", i, encoder->dcb->type);
++			NV_ERROR(dev, " %d: %d\n", i, encoder->dcb->type);
 +		}
 +
 +		return MODE_BAD;
@@ -25309,7 +25309,7 @@ index 0000000..763cffe
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_dac.c b/drivers/gpu/drm/nouveau/nv50_dac.c
 new file mode 100644
-index 0000000..e64c314
+index 0000000..9cebff4
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_dac.c
 @@ -0,0 +1,280 @@
@@ -25409,7 +25409,7 @@ index 0000000..e64c314
 +
 +	nv_wr32(NV50_PDISPLAY_DAC_REGS_LOAD_CTRL(or),
 +		NV50_PDISPLAY_DAC_REGS_LOAD_CTRL_ACTIVE | load_pattern);
-+	udelay(10000); /* give it some time to process */
++	udelay(45000); /* give it some time to process */
 +	load_state = nv_rd32(NV50_PDISPLAY_DAC_REGS_LOAD_CTRL(or));
 +
 +	nv_wr32(NV50_PDISPLAY_DAC_REGS_LOAD_CTRL(or), 0);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1588
retrieving revision 1.1589
diff -u -p -r1.1588 -r1.1589
--- kernel.spec	4 May 2009 08:22:26 -0000	1.1588
+++ kernel.spec	4 May 2009 22:44:11 -0000	1.1589
@@ -1967,6 +1967,9 @@ fi
 # and build.
 
 %changelog
+* Tue May 05 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.2-127
+- drm-nouveau.patch: bump dac load detection delay to match ddx
+
 * Mon May 04 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.2-126
 - Explicitly enable CONFIG_FB_MODE_HELPERS to fix build..