Re: GMA500: ERROR: "__bad_udelay" undefined!

[Ryan Mallon <rmallon@gmail.com>]

On 25/07/11 11:22, Ryan Mallon wrote:
> On 25/07/11 07:37, Jesper Juhl wrote:
>> Just got this when building the attached .config on x86_64 with gcc 
>> 4.6.1
>> on up-to-date mainline git tree (head at
>> b6844e8f64920cdee620157252169ba63afb0c89) :
>>
>>   ERROR: "__bad_udelay" [drivers/staging/gma500/psb_gfx.ko] undefined!
>>   make[1]: *** [__modpost] Error 1
>>
>> I don't need gma500, so I've just disabled the driver to get around 
>> it but
>> I thought some people might still like to know :)
>>
> __bad_udelay is a compile time check that constant udelays do not 
> exceed a certain threshold. For x86_64 it used to be n > 20000, now it 
> is n / 20000 >= 1. The problem is in 
> drivers/staging/gma500/psb_intel_display.c:psb_init_wait_for_vblank, 
> which does udelay(20000) which under the old code would have been 
> fine, but fails the new __bad_udelay check.
>
> Possibly the udelay can just be converted to an mdelay?

Here is the patch:
----
A change to the constraints for the compile time check for __bad_udelay 
on some architectures caused breakage in the gma500 staging driver. Fix 
by replacing udelay with mdelay.

Signed-off-by: Ryan Mallon <rmallon@gmail.com>
---

diff --git a/drivers/staging/gma500/psb_intel_display.c b/drivers/staging/gma500/psb_intel_display.c
index 4f47d09..09e378d 100644
--- a/drivers/staging/gma500/psb_intel_display.c
+++ b/drivers/staging/gma500/psb_intel_display.c
@@ -331,7 +331,7 @@ static bool psb_intel_find_best_PLL(struct drm_crtc *crtc, int target,
  void psb_intel_wait_for_vblank(struct drm_device *dev)
  {
  	/* Wait for 20ms, i.e. one cycle at 50hz. */
-	udelay(20000);
+	mdelay(20);
  }

  int psb_intel_pipe_set_base(struct drm_crtc *crtc,