From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= <ville.syrjala@linux.intel.com>
Subject: Re: [PATCH] drm/i915: fold wait_for_atomic_us into
	wait_for_atomic
Date: Thu, 28 Mar 2013 12:53:05 +0200
Message-ID: <20130328105305.GJ4469@intel.com>
References: <20130328103233.GH4469@intel.com>
	<1364466664-21037-1-git-send-email-daniel.vetter@ffwll.ch>
Mime-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
	by gabe.freedesktop.org (Postfix) with ESMTP id 43304E5C6F
	for <intel-gfx@lists.freedesktop.org>;
	Thu, 28 Mar 2013 03:53:10 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <1364466664-21037-1-git-send-email-daniel.vetter@ffwll.ch>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>, Jack Winter <jbh@alchemy.lu>
List-Id: intel-gfx@lists.freedesktop.org

On Thu, Mar 28, 2013 at 11:31:04AM +0100, Daniel Vetter wrote:
> Since
> =

> commit bcf9dcc1e6269fac674e41f25d007ff75f76e840
> Author: Chris Wilson <chris@chris-wilson.co.uk>
> 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 <ben@bwidawsk.net>
> 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.
> =

> v2: Fixup time unit conversion, _wait_for takes ms (Ville).
> =

> Cc: Jack Winter <jbh@alchemy.lu>
> Cc: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Reviewed-by: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>

> ---
>  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/inte=
l_drv.h
> index 54bc2ea..8e76f52f 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__ =3D jiffies + usecs_to_jiffies(US);	\
> -	int ret__ =3D 0;							\
> -	while (!(COND)) {						\
> -		if (time_after(jiffies, timeout__)) {			\
> -			ret__ =3D -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), \
> +					       DIV_ROUND_UP((US), 1000), 0)
>  =

>  #define KHz(x) (1000*x)
>  #define MHz(x) KHz(1000*x)
> -- =

> 1.7.11.7

-- =

Ville Syrj=E4l=E4
Intel OTC