From: Roman Z. <zi...@fh...> - 2000-06-16 15:59:45
|
Hi, > Sorry, I already committed both. I appended the diff below for amifb.c, I don't know if the locking problem is fixed before I leave into the weekend. bye, Roman Index: amifb.c =================================================================== RCS file: /cvsroot/linux-apus/2.3/drivers/video/amifb.c,v retrieving revision 1.4 diff -u -r1.4 amifb.c --- amifb.c 2000/06/16 10:44:31 1.4 +++ amifb.c 2000/06/16 15:37:58 @@ -1811,9 +1811,8 @@ */ ami_init_copper(); - free_irq(IRQ_AMIGA_AUTO_3,NULL); -#if 1 +#if 0 if (request_irq(IRQ_AMIGA_AUTO_3, amifb_interrupt, 0, "fb vertb handler", NULL)) { err = -EBUSY; @@ -1927,8 +1926,9 @@ static void amifb_interrupt(int irq, void *dev_id, struct pt_regs *fp) { - u_short ints = custom.intreqr & custom.intenar; unsigned long flags; +#if 0 + u_short ints = custom.intreqr & custom.intenar; if (ints & IF_BLIT) { custom.intreq = IF_BLIT; @@ -1937,6 +1937,7 @@ if (ints & IF_COPER) { custom.intreq = IF_COPER; +#endif if (do_vmode_pan || do_vmode_full) ami_update_display(); @@ -1971,6 +1972,7 @@ ami_reinit_copper(); do_vmode_full = 0; } +#if 0 amiga_do_irq_list(IRQ_AMIGA_VERTB, fp); } @@ -1978,6 +1980,7 @@ printk("%s: Warning: IF_VERTB was enabled\n", __FUNCTION__); custom.intena = IF_VERTB; } +#endif } /* |