You probably want to patch up mclk_wait in nva3_pm.c as well for now (until this code is ported to HWSQ or PDAEMON), even though it's not used by a lot of people.
Op 01-06-13 00:22, Arnd Bergmann schreef: > ARM cannot handle udelay for more than 2 miliseconds, so we > should use mdelay instead for those. > > Signed-off-by: Arnd Bergmann <arnd at arndb.de> > Cc: David Airlie <airlied at linux.ie> > Cc: Ben Skeggs <bskeggs at redhat.com> > Cc: dri-devel at lists.freedesktop.org > --- > drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c > b/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c > index d0817d9..ed7415e 100644 > --- a/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c > +++ b/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c > @@ -51,7 +51,8 @@ nv50_dac_sense(struct nv50_disp_priv *priv, int or, u32 > loadval) > const u32 doff = (or * 0x800); > int load = -EINVAL; > nv_wr32(priv, 0x61a00c + doff, 0x00100000 | loadval); > - udelay(9500); > + mdelay(9); > + udelay(500); > nv_wr32(priv, 0x61a00c + doff, 0x80000000); > load = (nv_rd32(priv, 0x61a00c + doff) & 0x38000000) >> 27; > nv_wr32(priv, 0x61a00c + doff, 0x00000000); -- Roy Spliet BSc. MSc. Student Delft University of Technology http://www.pds.ewi.tudelft.nl/msc/mallocinopencl/ -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20130601/d6668647/attachment-0001.html>
