From patchwork Tue Jul 7 07:10:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6730471 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BCD2BC05AC for ; Tue, 7 Jul 2015 07:08:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DF7082045A for ; Tue, 7 Jul 2015 07:08:02 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 1690420458 for ; Tue, 7 Jul 2015 07:08:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 868B46E3B9; Tue, 7 Jul 2015 00:08:01 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by gabe.freedesktop.org (Postfix) with ESMTPS id C5E1D6E3B9 for ; Tue, 7 Jul 2015 00:07:59 -0700 (PDT) Received: by wiga1 with SMTP id a1so247737104wig.0 for ; Tue, 07 Jul 2015 00:07:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=1aP0SLpLQBy6/a70KwaXtfcfbus6Ia23sFdzNljzC/A=; b=NY8DCfT1wJ+OWtr2Wc2N21Adoy9yX+05noTEpwn/KRAuawZbXsNmrbKxJmOW5vE+ow aUVq9VIsHSvJvoMEQb/UQpalLOu8iJi+MlV/BSByvoycXkP6+FBOECd7/5ZFt/hNbuUf VinUI1jXiJHuSbUNC/1aN8urj9lpCwS3JQou8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=1aP0SLpLQBy6/a70KwaXtfcfbus6Ia23sFdzNljzC/A=; b=TeY4hoznbSbNpTFJhP6gev4aCB2eGMtFp+JuYgeuJh/YPPGn5mWkoYEDpx4dinC/Od wA+6EKOEpAMKXSAIG4fxKiGG5jM6SOAb+uNgYGwuHd/r1xf6rKPiVwqCLbAPHPtojsiJ nIUP6zeBiuTuVmXndUWurk9ERcdO8HGDn2/iPjvy4KLtfuPhndf1gC1C5DlPxHvV6cHE cNhw7xoyqWH2jjiUC2aP/cBKiWRfWcWdtmqvSOeHDAymlTNSPvKQzd3fnTIUgXph+t0d cwXOaVugHA04t3CoANh6jheEv1KavNs1FQruLfVSwqL8OFn7AANEkhqhlhBegOq1j0ML Zxng== X-Gm-Message-State: ALoCoQmsJtAVaXbKDoGlwdlMSVs+3Kt3g9swSjdDY2a3a6QwkSpiwQfJFRlCu9i8NMhI2ZBdIzFq X-Received: by 10.194.184.140 with SMTP id eu12mr5395505wjc.78.1436252878573; Tue, 07 Jul 2015 00:07:58 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by mx.google.com with ESMTPSA id js3sm31826643wjc.5.2015.07.07.00.07.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Jul 2015 00:07:56 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 7 Jul 2015 09:10:40 +0200 Message-Id: <1436253040-20151-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.4 Cc: Daniel Vetter , Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: s/mdelay/msleep/ X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Burning cpu cycles isn't awesome, so use sleeps instead. Signed-off-by: Daniel Vetter Reviewed-by: Ville Syrjälä Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com) --- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 56316c1e945c..87be3f307e40 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1026,7 +1026,7 @@ static bool pipe_dsl_stopped(struct drm_device *dev, enum pipe pipe) line_mask = DSL_LINEMASK_GEN3; line1 = I915_READ(reg) & line_mask; - mdelay(5); + msleep(5); line2 = I915_READ(reg) & line_mask; return line1 == line2; diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 6eb5d76e6912..1efac89cb738 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -4255,7 +4255,7 @@ static void ironlake_enable_drps(struct drm_device *dev) if (wait_for_atomic((I915_READ(MEMSWCTL) & MEMCTL_CMD_STS) == 0, 10)) DRM_ERROR("stuck trying to change perf mode\n"); - mdelay(1); + msleep(1); ironlake_set_drps(dev, fstart); @@ -4286,10 +4286,10 @@ static void ironlake_disable_drps(struct drm_device *dev) /* Go back to the starting frequency */ ironlake_set_drps(dev, dev_priv->ips.fstart); - mdelay(1); + msleep(1); rgvswctl |= MEMCTL_CMD_STS; I915_WRITE(MEMSWCTL, rgvswctl); - mdelay(1); + msleep(1); spin_unlock_irq(&mchdev_lock); }