rpms/kernel/F-11 drm-nouveau.patch,1.45,1.46

Ben Skeggs bskeggs at fedoraproject.org
Mon May 4 22:47:48 UTC 2009


Author: bskeggs

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

Modified Files:
	drm-nouveau.patch 
Log Message:
drm-nouveau.patch: use mdelay instead..


drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- drm-nouveau.patch	4 May 2009 22:44:10 -0000	1.45
+++ drm-nouveau.patch	4 May 2009 22:47:47 -0000	1.46
@@ -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..9cebff4
+index 0000000..ecd16d2
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_dac.c
 @@ -0,0 +1,280 @@
@@ -25409,7 +25409,7 @@ index 0000000..9cebff4
 +
 +	nv_wr32(NV50_PDISPLAY_DAC_REGS_LOAD_CTRL(or),
 +		NV50_PDISPLAY_DAC_REGS_LOAD_CTRL_ACTIVE | load_pattern);
-+	udelay(45000); /* give it some time to process */
++	mdelay(45); /* 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);




More information about the scm-commits mailing list