[PATCH] [resend] cyber2000fb: fix machine hang on module load

[PATCH] [resend] cyber2000fb: fix machine hang on module load

[Ondrej Zary]

Hello,
I was testing two CyberPro 2000 based PCI cards on x86 and the machine always
hanged completely when the cyber2000fb module was loaded. It seems that the
card hangs when some registers are accessed too quickly after writing RAMDAC
control register. With this patch, both card work.

Add delay after RAMDAC control register write to prevent hangs on module load.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>

--- linux-2.6.35-rc2/drivers/video/cyber2000fb.c	2010-06-06 05:43:24.000000000 +0200
+++ linux-2.6.35-rc3/drivers/video/cyber2000fb.c	2010-07-25 18:20:47.000000000 +0200
@@ -436,6 +436,7 @@ static void cyber2000fb_write_ramdac_ctr
 	cyber2000fb_writeb(i | 4, 0x3cf, cfb);
 	cyber2000fb_writeb(val, 0x3c6, cfb);
 	cyber2000fb_writeb(i, 0x3cf, cfb);
+	udelay(1);
 }
 
 static void cyber2000fb_set_timing(struct cfb_info *cfb, struct par_info *hw)


-- 
Ondrej Zary

Re: [PATCH] [resend] cyber2000fb: fix machine hang on module load

[Russell King - ARM Linux]

On Tue, Jul 27, 2010 at 03:29:20PM +0200, Ondrej Zary wrote:
> Hello,
> I was testing two CyberPro 2000 based PCI cards on x86 and the machine always
> hanged completely when the cyber2000fb module was loaded. It seems that the
> card hangs when some registers are accessed too quickly after writing RAMDAC
> control register. With this patch, both card work.
> 
> Add delay after RAMDAC control register write to prevent hangs on module load.

This one on the other hand I think is rather too heavy.

What might be better is to re-code the last register write to use
the x86 outb_p() stuff to slow it down, rather than using udelay().
Could you try something along those lines please?

Re: [PATCH] [resend] cyber2000fb: fix machine hang on module load

[Ondrej Zary]

On Tuesday 27 July 2010 18:25:11 Russell King - ARM Linux wrote:
> On Tue, Jul 27, 2010 at 03:29:20PM +0200, Ondrej Zary wrote:
> > Hello,
> > I was testing two CyberPro 2000 based PCI cards on x86 and the machine
> > always hanged completely when the cyber2000fb module was loaded. It seems
> > that the card hangs when some registers are accessed too quickly after
> > writing RAMDAC control register. With this patch, both card work.
> >
> > Add delay after RAMDAC control register write to prevent hangs on module
> > load.
>
> This one on the other hand I think is rather too heavy.
>
> What might be better is to re-code the last register write to use
> the x86 outb_p() stuff to slow it down, rather than using udelay().
> Could you try something along those lines please?

Is this better?


I was testing two CyberPro 2000 based PCI cards on x86 and the machine always
hanged completely when the cyber2000fb module was loaded. It seems that the
card hangs when some registers are accessed too quickly after writing RAMDAC
control register. With this patch, both card work.

Add delay after RAMDAC control register write to prevent hangs on module load.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>

--- linux-2.6.35-rc2-orig/drivers/video/cyber2000fb.c	2010-06-06 05:43:24.000000000 +0200
+++ linux-2.6.35-rc3/drivers/video/cyber2000fb.c	2010-07-27 23:12:37.000000000 +0200
@@ -436,6 +436,8 @@ static void cyber2000fb_write_ramdac_ctr
 	cyber2000fb_writeb(i | 4, 0x3cf, cfb);
 	cyber2000fb_writeb(val, 0x3c6, cfb);
 	cyber2000fb_writeb(i, 0x3cf, cfb);
+	/* prevent card lock-up observed on x86 with CyberPro 2000 */
+	cyber2000fb_readb(0x3cf, cfb);
 }
 
 static void cyber2000fb_set_timing(struct cfb_info *cfb, struct par_info *hw)



-- 
Ondrej Zary