diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-05-31 22:22:40 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2013-06-03 19:20:56 +1000 |
| commit | b06f6a9d06f4b0fa38bd3e32714106d824470813 (patch) | |
| tree | 1866b220b763c4211d0fb35f1cc97f7251c8c1d5 /drivers/gpu | |
| parent | 1ed7fad6dbb211142cb61169d8d0bbbb049d4de1 (diff) | |
| download | linux-b06f6a9d06f4b0fa38bd3e32714106d824470813.tar.gz linux-b06f6a9d06f4b0fa38bd3e32714106d824470813.tar.xz | |
drm/nouveau: use mdelay instead of large udelay constants
ARM cannot handle udelay for more than 2 miliseconds, so we
should use mdelay instead for those.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Dave Airlie <airlied@gmail.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c b/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c index d0817d94454c..ed7415e5e220 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); |