rpms/kernel/devel drm-maybe-fix-nouveau.patch, NONE, 1.1 kernel.spec, 1.1351, 1.1352

[Kyle McMartin]

Author: kyle

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

Modified Files:
	kernel.spec 
Added Files:
	drm-maybe-fix-nouveau.patch 
Log Message:
* Fri Feb 27 2009 Kyle McMartin <kyle at redhat.com> 2.6.29-0.172.rc6.git4
- avoid a 64-bit divide which generates a libgcc __udivdi3 call
  in drm-nouveau. maybe.


drm-maybe-fix-nouveau.patch:

--- NEW FILE drm-maybe-fix-nouveau.patch ---
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
index 5b4a646..5574952 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
@@ -309,7 +309,7 @@ nv50_mem_vm_bind_linear(struct drm_device *dev, uint64_t virt, uint32_t size,
 	if (flags & 0x80000000) {
 		while (size) {
 			struct nouveau_gpuobj *pt = pgt[virt / (512*1024*1024)];
-			int pte = ((virt % (512*1024*1024)) / psz) * 2;
+			int pte = ((u32)(virt % (512*1024*1024)) / psz) * 2;
 
 			INSTANCE_WR(pt, pte++, 0x00000000);
 			INSTANCE_WR(pt, pte++, 0x00000000);
@@ -320,7 +320,7 @@ nv50_mem_vm_bind_linear(struct drm_device *dev, uint64_t virt, uint32_t size,
 	} else {
 		while (size) {
 			struct nouveau_gpuobj *pt = pgt[virt / (512*1024*1024)];
-			int pte = ((virt % (512*1024*1024)) / psz) * 2;
+			int pte = ((u32)(virt % (512*1024*1024)) / psz) * 2;
 
 			INSTANCE_WR(pt, pte++, phys | pfl);
 			INSTANCE_WR(pt, pte++, flags);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1351
retrieving revision 1.1352
diff -u -r1.1351 -r1.1352
--- kernel.spec	27 Feb 2009 07:15:33 -0000	1.1351
+++ kernel.spec	27 Feb 2009 07:59:41 -0000	1.1352
@@ -649,6 +649,7 @@
 #Patch1815: drm-intel-next.patch
 Patch1816: drm-no-gem-on-i8xx.patch
 Patch1818: drm-i915-resume-force-mode.patch
+Patch1819: drm-maybe-fix-nouveau.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1183,6 +1184,7 @@
 #ApplyPatch drm-intel-next.patch
 ApplyPatch drm-no-gem-on-i8xx.patch
 ApplyPatch drm-i915-resume-force-mode.patch
+ApplyPatch drm-maybe-fix-nouveau.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1788,6 +1790,10 @@
 # and build.
 
 %changelog
+* Fri Feb 27 2009 Kyle McMartin <kyle at redhat.com> 2.6.29-0.172.rc6.git4
+- avoid a 64-bit divide which generates a libgcc __udivdi3 call
+  in drm-nouveau. maybe.
+
 * Fri Feb 27 2009 Kyle McMartin <kyle at redhat.com> 2.6.29-0.171.rc6.git4
 - fixt drm-nouveau for drm-next.