Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757082Ab3EVTtl (ORCPT ); Wed, 22 May 2013 15:49:41 -0400 Received: from mout.gmx.net ([212.227.17.20]:65460 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757029Ab3EVTt1 (ORCPT ); Wed, 22 May 2013 15:49:27 -0400 X-Authenticated: #9962044 X-Provags-ID: V01U2FsdGVkX1888osGqFk8fhsiCpAE12q5nxbRymWVb2v+O6pe6D Pmla7LAqXrc4OL From: Marc Dietrich To: linux-kernel@vger.kernel.org Cc: David Airlie , Ben Skeggs Subject: [PATCH 2/2] nouveau: replace large udelay by mdelay Date: Wed, 22 May 2013 21:48:42 +0200 Message-Id: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: X-Y-GMX-Trusted: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1250 Lines: 31 ARM has a maximum of 2000 usec delay. Use mdelay for larger delays. This affects distro kernels mostly. Cc: David Airlie Cc: Ben Skeggs Signed-off-by: Marc Dietrich --- 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/