aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/amifb.c
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-11-21 15:53:58 -0500
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2011-12-03 17:03:32 -0500
commitaf5761d609290375cb8bc4ee77293da2560c574a (patch)
tree5e3df5fdb27dd18d3583cbe211bf8479504818c8 /drivers/video/amifb.c
parent03c740a04c8da4204ec6e7c6206e1d8a4a429dbe (diff)
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:
3733 memset(dummysprite, 0, DUMMYSPRITEMEMSIZE); 3733 memset(dummysprite, 0, DUMMYSPRITEMEMSIZE);
3734 3734
3735 /* 3735 /*
3736 * Enable Display DMA 3736 * Make sure the Copper has something to do
3737 */ 3737 */
3738 3738 ami_init_copper();
3739 custom.dmacon = DMAF_SETCLR | DMAF_MASTER | DMAF_RASTER | DMAF_COPPER |
3740 DMAF_BLITTER | DMAF_SPRITE;
3741 3739
3742 /* 3740 /*
3743 * Make sure the Copper has something to do 3741 * Enable Display DMA
3744 */ 3742 */
3745 3743 custom.dmacon = DMAF_SETCLR | DMAF_MASTER | DMAF_RASTER | DMAF_COPPER |
3746 ami_init_copper(); 3744 DMAF_BLITTER | DMAF_SPRITE;
3747 3745
3748 if (request_irq(IRQ_AMIGA_COPPER, amifb_interrupt, 0, 3746 if (request_irq(IRQ_AMIGA_COPPER, amifb_interrupt, 0,
3749 "fb vertb handler", &currentpar)) { 3747 "fb vertb handler", &currentpar)) {