diff options
| author | David Miller <davem@davemloft.net> | 2007-03-05 10:35:36 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-05 17:12:54 +0100 |
| commit | 8690ba446defe2e2b81803756c099d2943dfd5fd (patch) | |
| tree | c7df0f8765ffeeb192ae2a338427c4158100d77d /drivers/video/aty/mach64_ct.c | |
| parent | [PATCH] arch/i386/kernel/vmi.c must #include <asm/kmap_types.h> (diff) | |
| download | linux-8690ba446defe2e2b81803756c099d2943dfd5fd.tar.xz linux-8690ba446defe2e2b81803756c099d2943dfd5fd.zip | |
[PATCH] video/aty/mach64_ct.c: fix bogus delay loop
CT based mach64 cards were reported to hang on sparc64 boxes when
compiled with gcc-4.1.x and later.
Looking at this piece of code, it's no surprise. A critical
delay was implemented as an empty for() loop, and gcc 4.0.x
and previous did not optimize it away, so we did get a delay.
But gcc-4.1.x and later can optimize it away, and we get crashes.
Use a real udelay() to fix this. Fix verified on SunBlade100.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/aty/mach64_ct.c')
| -rw-r--r-- | drivers/video/aty/mach64_ct.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/aty/mach64_ct.c b/drivers/video/aty/mach64_ct.c index f3b487b8710b..1fdcfdbf669b 100644 --- a/drivers/video/aty/mach64_ct.c +++ b/drivers/video/aty/mach64_ct.c @@ -598,7 +598,6 @@ static void aty_resume_pll_ct(const struct fb_info *info, struct atyfb_par *par = info->par; if (par->mclk_per != par->xclk_per) { - int i; /* * This disables the sclk, crashes the computer as reported: * aty_st_pll_ct(SPLL_CNTL2, 3, info); @@ -614,7 +613,7 @@ static void aty_resume_pll_ct(const struct fb_info *info, * helps for Rage Mobilities that sometimes crash when * we switch to sclk. (Daniel Mantione, 13-05-2003) */ - for (i=0;i<=0x1ffff;i++); + udelay(500); } aty_st_pll_ct(PLL_REF_DIV, pll->ct.pll_ref_div, par); |