From defc167ddf5a5a078c4a1e8f7376e8e6e9fab646 Mon Sep 17 00:00:00 2001 From: Ville Syrjala Date: Tue, 8 May 2007 00:39:44 -0700 Subject: [PATCH] --- yaml --- r: 54955 b: refs/heads/master c: 94f45bcd1c29e773b6bf189ef7b9a3437d016320 h: refs/heads/master i: 54953: fb2f1176620ebca9be2bdc4fe6d514c8be2bac9c 54951: 1ec9027279bdbcfe47a62abf5af826b24d673827 v: v3 --- [refs] | 2 +- trunk/drivers/video/aty/mach64_ct.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 867e202672b4..0430f1124ebd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2620c6e31735248ac26403558bd4279a8af619d8 +refs/heads/master: 94f45bcd1c29e773b6bf189ef7b9a3437d016320 diff --git a/trunk/drivers/video/aty/mach64_ct.c b/trunk/drivers/video/aty/mach64_ct.c index 1fdcfdbf669b..cc9e9779b75f 100644 --- a/trunk/drivers/video/aty/mach64_ct.c +++ b/trunk/drivers/video/aty/mach64_ct.c @@ -608,12 +608,10 @@ static void aty_resume_pll_ct(const struct fb_info *info, aty_st_pll_ct(SCLK_FB_DIV, pll->ct.sclk_fb_div, par); aty_st_pll_ct(SPLL_CNTL2, pll->ct.spll_cntl2, par); /* - * The sclk has been started. However, I believe the first clock - * ticks it generates are not very stable. Hope this primitive loop - * helps for Rage Mobilities that sometimes crash when - * we switch to sclk. (Daniel Mantione, 13-05-2003) + * SCLK has been started. Wait for the PLL to lock. 5 ms + * should be enough according to mach64 programmer's guide. */ - udelay(500); + mdelay(5); } aty_st_pll_ct(PLL_REF_DIV, pll->ct.pll_ref_div, par);