diff options
authorDavid S. Miller <>2007-03-08 08:17:20 +0100
committerAdrian Bunk <>2007-03-08 08:17:20 +0100
commit2d3bc628ad9b9c883f94a2d5a9ad48b0a95101a3 (patch)
parent1a6b8d666d090d821cbc9c07d788ac85639d74c8 (diff)
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 <> Signed-off-by: Adrian Bunk <>
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/aty/mach64_ct.c b/drivers/video/aty/mach64_ct.c
index e7056934c6a8..11c7bbc9e84a 100644
--- a/drivers/video/aty/mach64_ct.c
+++ b/drivers/video/aty/mach64_ct.c
@@ -399,7 +399,7 @@ static int __init aty_init_pll_ct(const struct fb_info *info,
struct atyfb_par *par = (struct atyfb_par *) info->par;
u8 mpost_div, xpost_div, sclk_post_div_real, sclk_fb_div, spll_cntl2;
- u32 q, i, memcntl, trp;
+ u32 q, memcntl, trp;
u32 dsp_config, dsp_on_off, vga_dsp_config, vga_dsp_on_off;
#ifdef DEBUG
int pllmclk, pllsclk;
@@ -598,7 +598,7 @@ static int __init aty_init_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);