Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753847Ab3E0JKT (ORCPT ); Mon, 27 May 2013 05:10:19 -0400 Received: from mout.gmx.net ([212.227.17.20]:55191 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752819Ab3E0JKS (ORCPT ); Mon, 27 May 2013 05:10:18 -0400 X-Authenticated: #9962044 X-Provags-ID: V01U2FsdGVkX1+fhDlL7L2fwIgBGe1gOzofTT+ITXFEan9QZqx14R cTeScXpceyhl5/ From: Marc Dietrich To: Ben Skeggs Cc: David Airlie , linux-kernel@vger.kernel.org, arnd@arndb.de Subject: Re: [PATCH 2/2] nouveau: replace large udelay by mdelay Date: Mon, 27 May 2013 11:10:16 +0200 Message-ID: <1626158.oghkNeep0B@fb07-iapwap2.physik.uni-giessen.de> User-Agent: KMail/4.10.2 (Linux/3.9.2-8.g04040b9-desktop; KDE/4.10.2; x86_64; ; ) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="ISO-8859-1" X-Y-GMX-Trusted: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1470 Lines: 41 Hi Ben, can you pick up Arnd's fix from https://patchwork.kernel.org/patch/2489141/ for your stable (3.10) branch? Marc Am Mittwoch, 22. Mai 2013, 21:48:42 schrieb Marc Dietrich: > 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); -- 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/