[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <d75e9ee62d4cba8efc86c23476f746f145ecb676.1369251478.git.marvin24@gmx.de>
Date: Wed, 22 May 2013 21:48:42 +0200
From: Marc Dietrich <marvin24@....de>
To: linux-kernel@...r.kernel.org
Cc: David Airlie <airlied@...ux.ie>, Ben Skeggs <bskeggs@...hat.com>
Subject: [PATCH 2/2] nouveau: replace large udelay by mdelay
ARM has a maximum of 2000 usec delay. Use mdelay for larger delays.
This affects distro kernels mostly.
Cc: David Airlie <airlied@...ux.ie>
Cc: Ben Skeggs <bskeggs@...hat.com>
Signed-off-by: Marc Dietrich <marvin24@....de>
---
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);
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists