From af5761d609290375cb8bc4ee77293da2560c574a Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Mon, 21 Nov 2011 21:53:58 +0100 Subject: [PATCH] fbdev/amifb: Enable Copper DMA after setting up the Copper Else the Copper may start executing random instructions Signed-off-by: Geert Uytterhoeven Signed-off-by: Florian Tobias Schandinat --- drivers/video/amifb.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 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 @@ -3732,19 +3732,17 @@ static int __init amifb_probe(struct platform_device *pdev) 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", ¤tpar)) { err = -EBUSY;