From patchwork Thu Apr 25 17:28:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2489141 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 9C6C13FC64 for ; Thu, 25 Apr 2013 17:29:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8C367E65E6 for ; Thu, 25 Apr 2013 10:29:23 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.187]) by gabe.freedesktop.org (Postfix) with ESMTP id 1973EE612C for ; Thu, 25 Apr 2013 10:29:10 -0700 (PDT) Received: from wuerfel.lan (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mrbap4) with ESMTP (Nemesis) id 0Lk9Jy-1V36q21TTO-00c6o0; Thu, 25 Apr 2013 19:29:04 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 08/21] drm/nouveau: use mdelay instead of large udelay constants Date: Thu, 25 Apr 2013 19:28:51 +0200 Message-Id: <1366910944-3033663-9-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1366910944-3033663-1-git-send-email-arnd@arndb.de> References: <1366910944-3033663-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:ckOpK7pL/psXn0RUH2LoulPPDJ2uthw9/uDDZ6lRq5l Y/z/7vPSMTIEXTUksbDOAxn47LEHMX3FXGO/hj7RbTv7a8cw3l H31lvkq6G4nXbrmj3UPRuok7WuEAU9MlYtW17oXSXJznBGTlVl Oxo1rc0b3HYFyomko4Ji1lvQSiK8jhcIilLt6af9w6xpaTcveh i0oMA1G/i5DYR+EtuAUkdBGi1iRAuS4UDjq6ncTZ7XD96BUqIy cGEPmQu7tJgTkqXC9qOpOxTofDvLk4KKpF0rXiiMekffxLKNYh 5F7aRoVHuGb96XyqwLymbVx7XEtZzTBvW5LeoXGshwYhs/f0Sl aWh9K/cMa09A3aMqsd+Kihns9VDNiH7t+kzxqCDut Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Ben Skeggs X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org ARM cannot handle udelay for more than 2 miliseconds, so we should use mdelay instead for those. Signed-off-by: Arnd Bergmann Cc: David Airlie Cc: Ben Skeggs Cc: dri-devel@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);