commit af5761d609290375cb8bc4ee77293da2560c574a
author Geert Uytterhoeven <geert@linux-m68k.org> Mon Nov 21 21:53:58 2011 +0100
committer Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Sat Dec 03 22:03:32 2011 +0000
tree 5e3df5fdb27dd18d3583cbe211bf8479504818c8
parent 03c740a04c8da4204ec6e7c6206e1d8a4a429dbe

fbdev/amifb: Enable Copper DMA after setting up the Copper

Else the Copper may start executing random instructions

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>

drivers/video/amifb.c

diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index 13e7a17..2bfaf1b 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -3733,18 +3733,16 @@
 	memset(dummysprite, 0, DUMMYSPRITEMEMSIZE);
 
 	/*
-	 * Enable Display DMA
-	 */
-
-	custom.dmacon = DMAF_SETCLR | DMAF_MASTER | DMAF_RASTER | DMAF_COPPER |
-			DMAF_BLITTER | DMAF_SPRITE;
-
-	/*
 	 * Make sure the Copper has something to do
 	 */
-
 	ami_init_copper();
 
+	/*
+	 * Enable Display DMA
+	 */
+	custom.dmacon = DMAF_SETCLR | DMAF_MASTER | DMAF_RASTER | DMAF_COPPER |
+			DMAF_BLITTER | DMAF_SPRITE;
+
 	if (request_irq(IRQ_AMIGA_COPPER, amifb_interrupt, 0,
 			"fb vertb handler", &currentpar)) {
 		err = -EBUSY;