diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-11-21 21:53:58 +0100 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-12-03 22:03:32 +0000 |
| commit | af5761d609290375cb8bc4ee77293da2560c574a (patch) | |
| tree | 5e3df5fdb27dd18d3583cbe211bf8479504818c8 /drivers/video | |
| parent | 03c740a04c8da4204ec6e7c6206e1d8a4a429dbe (diff) | |
| download | linux-3.10-af5761d609290375cb8bc4ee77293da2560c574a.tar.gz linux-3.10-af5761d609290375cb8bc4ee77293da2560c574a.tar.bz2 linux-3.10-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')
| -rw-r--r-- | drivers/video/amifb.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c index 13e7a179f8d..2bfaf1b86d4 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", ¤tpar)) { |