summaryrefslogtreecommitdiffstats
path: root/drivers/video/amifb.c
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-11-21 21:53:58 +0100
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2011-12-03 22:03:32 +0000
commitaf5761d609290375cb8bc4ee77293da2560c574a (patch)
tree5e3df5fdb27dd18d3583cbe211bf8479504818c8 /drivers/video/amifb.c
parent03c740a04c8da4204ec6e7c6206e1d8a4a429dbe (diff)
downloadlinux-stable-af5761d609290375cb8bc4ee77293da2560c574a.tar.gz
linux-stable-af5761d609290375cb8bc4ee77293da2560c574a.tar.bz2
linux-stable-af5761d609290375cb8bc4ee77293da2560c574a.zip
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>
Diffstat (limited to 'drivers/video/amifb.c')
-rw-r--r--drivers/video/amifb.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index 13e7a179f8d4..2bfaf1b86d46 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -3733,17 +3733,15 @@ default_chipset:
memset(dummysprite, 0, DUMMYSPRITEMEMSIZE);
/*
- * Enable Display DMA
+ * Make sure the Copper has something to do
*/
-
- custom.dmacon = DMAF_SETCLR | DMAF_MASTER | DMAF_RASTER | DMAF_COPPER |
- DMAF_BLITTER | DMAF_SPRITE;
+ ami_init_copper();
/*
- * Make sure the Copper has something to do
+ * Enable Display DMA
*/
-
- ami_init_copper();
+ 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)) {