From patchwork Wed Mar 27 23:03:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2353641 Return-Path: X-Original-To: patchwork-intel-gfx@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 3436F3FC8C for ; Wed, 27 Mar 2013 23:15:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EB30BE5F08 for ; Wed, 27 Mar 2013 16:15:44 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f174.google.com (mail-ea0-f174.google.com [209.85.215.174]) by gabe.freedesktop.org (Postfix) with ESMTP id 1BE8FE5DCB for ; Wed, 27 Mar 2013 16:15:31 -0700 (PDT) Received: by mail-ea0-f174.google.com with SMTP id m14so1509900eaj.5 for ; Wed, 27 Mar 2013 16:15:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=woYqPJWXWTkvfgs2nl5mksOt0+1w+1HD0238K4qtgm0=; b=Z1MIePLIggLnf9gE8Qmvz3ZEFNmcyYQ8Iv5d7GKy9S/qJMS8mrMiwg5khD6wcBKVPL q8WjxsEi2ZC9xk+UwJNkayhgwx1D7rSUXKmBKS+Zb24tqIGIJJRSVyFyYsBp5XYueO97 ksg7nSgLeqVgy5ihlBWVliw9MVLHdy4Bk7Oh0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=woYqPJWXWTkvfgs2nl5mksOt0+1w+1HD0238K4qtgm0=; b=LBxvx0+xmnz/L7aH41bfcZ5DEn+7wRV9tkaZiXqWZJWjCQy23TUmzIzw4UDPcazdbK bs25BJ1dC40+FFw+IN5msYeFAriWRnWabnh+yiCdiDRPVuToPezKPCmwIijPTtZ1fJUf OBkTQVZPw0yt23JJYpb7bEOY+I0aAcOGOCdHqrcIwZ+clYi5ySQ/4ezOoVfu868c6lka bLUw3LxMA108E9qMRr8uUpiHakDdzuryA1GKMvbsJZKTqF9F0LO4FE1GcNDdShda2k2R Ms68FdFlZrD+y/ym0hihvYaSg40VtxK0mfukM/lkDL5Z/dvhIusTboBU66etbAp+sByn wkeA== X-Received: by 10.15.34.198 with SMTP id e46mr60715421eev.27.1364426130691; Wed, 27 Mar 2013 16:15:30 -0700 (PDT) Received: from wespe.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id bc1sm22899963eeb.11.2013.03.27.16.15.28 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 27 Mar 2013 16:15:29 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 28 Mar 2013 00:03:24 +0100 Message-Id: <1364425405-1200-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.7 X-Gm-Message-State: ALoCoQk8rQ+pCGKrbG9vNetM51zgKgoMsOICUTreYlyo8UDskqQLQ/2IBt99KFAj0QBxpbq4nBQz Cc: Daniel Vetter , Jack Winter Subject: [Intel-gfx] [PATCH 1/2] drm/i915: fold wait_for_atomic_us into wait_for_atomic X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Since commit bcf9dcc1e6269fac674e41f25d007ff75f76e840 Author: Chris Wilson Date: Sun Jul 15 09:42:38 2012 +0100 drm/i915: Workaround hang with BSD and forcewake on SandyBridge and commit 0cc2764cc4a4bd73df55f8893c871778cf7ddd0f Author: Ben Widawsky Date: Sat Sep 1 22:59:48 2012 -0700 drm/i915: use cpu_relax() in wait_for_atomic these two macros are essentially the same, so unify them. We keep the _us version since it's a nice documentation for smaller timeouts. Cc: Jack Winter Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_drv.h | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 54bc2ea..c8c1979 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -50,21 +50,10 @@ ret__; \ }) -#define wait_for_atomic_us(COND, US) ({ \ - unsigned long timeout__ = jiffies + usecs_to_jiffies(US); \ - int ret__ = 0; \ - while (!(COND)) { \ - if (time_after(jiffies, timeout__)) { \ - ret__ = -ETIMEDOUT; \ - break; \ - } \ - cpu_relax(); \ - } \ - ret__; \ -}) - #define wait_for(COND, MS) _wait_for(COND, MS, 1) #define wait_for_atomic(COND, MS) _wait_for(COND, MS, 0) +#define wait_for_atomic_us(COND, US) _wait_for((COND), \ + usecs_to_jiffies((US)), 0) #define KHz(x) (1000*x) #define MHz(x) KHz(1000*x)