rpms/kernel/devel drm-rv710-ucode-fix.patch, NONE, 1.1 kernel.spec, 1.1745, 1.1746

[Adam Jackson]

Author: ajax

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

Modified Files:
	kernel.spec 
Added Files:
	drm-rv710-ucode-fix.patch 
Log Message:
* Thu Aug 27 2009 Adam Jackson <ajax at redhat.com>
- drm-rv710-ucode-fix.patch: Treat successful microcode load on RV710 as,
  you know, success. (#519718)


drm-rv710-ucode-fix.patch:
 rv770.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE drm-rv710-ucode-fix.patch ---
diff -up linux-2.6.30.noarch/drivers/gpu/drm/radeon/rv770.c.jx linux-2.6.30.noarch/drivers/gpu/drm/radeon/rv770.c
--- linux-2.6.30.noarch/drivers/gpu/drm/radeon/rv770.c.jx	2009-08-27 14:45:25.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/radeon/rv770.c	2009-08-27 14:54:30.000000000 -0400
@@ -282,6 +282,7 @@ static int rv770_cp_load_microcode(struc
 		for (i = 0; i < R700_PM4_UCODE_SIZE; i++)
 			WREG32(CP_ME_RAM_DATA, RV710_cp_microcode[i]);
 		WREG32(CP_ME_RAM_WADDR, 0);
+		break;
 	default:
 		DRM_ERROR("Unknown chipset for RV7XX microcode\n");
 		return -1;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1745
retrieving revision 1.1746
diff -u -p -r1.1745 -r1.1746
--- kernel.spec	27 Aug 2009 13:32:34 -0000	1.1745
+++ kernel.spec	27 Aug 2009 18:58:31 -0000	1.1746
@@ -691,6 +691,7 @@ Patch1821: drm-page-flip.patch
 Patch1824: drm-intel-next.patch
 Patch1825: drm-intel-pm.patch
 Patch1826: drm-r600-kms.patch
+Patch1827: drm-rv710-ucode-fix.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1311,6 +1312,7 @@ ApplyPatch linux-2.6-e1000-ich9.patch
 # Nouveau DRM + drm fixes
 ApplyPatch drm-next.patch
 ApplyPatch drm-r600-kms.patch
+ApplyPatch drm-rv710-ucode-fix.patch
 
 ApplyPatch drm-nouveau.patch
 # pm broken on my thinkpad t60p - airlied
@@ -2009,6 +2011,10 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 27 2009 Adam Jackson <ajax at redhat.com>
+- drm-rv710-ucode-fix.patch: Treat successful microcode load on RV710 as,
+  you know, success. (#519718)
+
 * Thu Aug 27 2009 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.31-rc7-git5
 - Drop patch linux-2.6-ima-leak.patch, now merged upstream.