Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Ben Widawsky <ben@bwidawsk.net>
Subject: Re: [PATCH 1/4] drm/i915: Extract forcewake ack timeout
Date: Mon, 03 Sep 2012 11:42:54 +0300	[thread overview]
Message-ID: <87oblna44x.fsf@intel.com> (raw)
In-Reply-To: <1346565590-1760-1-git-send-email-ben@bwidawsk.net>

On Sun, 02 Sep 2012, Ben Widawsky <ben@bwidawsk.net> wrote:
> It's used all over the place, and we want to be able to play around with
> the value, apparently. Note that it doesn't touch other timeouts of the
> same value (like gtfifo, and thread C0 wait).
>
> Signed-off-by: Ben Widawsky <ben@bwidawsk.net>

On the series,

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  drivers/gpu/drm/i915/intel_pm.c | 17 ++++++++++++-----
>  1 file changed, 12 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index c0721ff..f42c142 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -31,6 +31,8 @@
>  #include "../../../platform/x86/intel_ips.h"
>  #include <linux/module.h>
>  
> +#define FORCEWAKE_ACK_TIMEOUT_US 500
> +
>  /* FBC, or Frame Buffer Compression, is a technique employed to compress the
>   * framebuffer contents in-memory, aiming at reducing the required bandwidth
>   * during in-memory transfers and, therefore, reduce the power packet.
> @@ -3968,13 +3970,15 @@ static void __gen6_gt_force_wake_get(struct drm_i915_private *dev_priv)
>  	else
>  		forcewake_ack = FORCEWAKE_ACK;
>  
> -	if (wait_for_atomic_us((I915_READ_NOTRACE(forcewake_ack) & 1) == 0, 500))
> +	if (wait_for_atomic_us((I915_READ_NOTRACE(forcewake_ack) & 1) == 0,
> +			       FORCEWAKE_ACK_TIMEOUT_US))
>  		DRM_ERROR("Force wake wait timed out\n");
>  
>  	I915_WRITE_NOTRACE(FORCEWAKE, 1);
>  	POSTING_READ(FORCEWAKE);
>  
> -	if (wait_for_atomic_us((I915_READ_NOTRACE(forcewake_ack) & 1), 500))
> +	if (wait_for_atomic_us((I915_READ_NOTRACE(forcewake_ack) & 1),
> +			       FORCEWAKE_ACK_TIMEOUT_US))
>  		DRM_ERROR("Force wake wait timed out\n");
>  
>  	__gen6_gt_wait_for_thread_c0(dev_priv);
> @@ -3989,13 +3993,15 @@ static void __gen6_gt_force_wake_mt_get(struct drm_i915_private *dev_priv)
>  	else
>  		forcewake_ack = FORCEWAKE_MT_ACK;
>  
> -	if (wait_for_atomic_us((I915_READ_NOTRACE(forcewake_ack) & 1) == 0, 500))
> +	if (wait_for_atomic_us((I915_READ_NOTRACE(forcewake_ack) & 1) == 0,
> +			       FORCEWAKE_ACK_TIMEOUT_US))
>  		DRM_ERROR("Force wake wait timed out\n");
>  
>  	I915_WRITE_NOTRACE(FORCEWAKE_MT, _MASKED_BIT_ENABLE(1));
>  	POSTING_READ(FORCEWAKE_MT);
>  
> -	if (wait_for_atomic_us((I915_READ_NOTRACE(forcewake_ack) & 1), 500))
> +	if (wait_for_atomic_us((I915_READ_NOTRACE(forcewake_ack) & 1),
> +			       FORCEWAKE_ACK_TIMEOUT_US))
>  		DRM_ERROR("Force wake wait timed out\n");
>  
>  	__gen6_gt_wait_for_thread_c0(dev_priv);
> @@ -4082,7 +4088,8 @@ static void vlv_force_wake_get(struct drm_i915_private *dev_priv)
>  	I915_WRITE_NOTRACE(FORCEWAKE_VLV, 0xffffffff);
>  	POSTING_READ(FORCEWAKE_VLV);
>  
> -	if (wait_for_atomic_us((I915_READ_NOTRACE(FORCEWAKE_ACK_VLV) & 1), 500))
> +	if (wait_for_atomic_us((I915_READ_NOTRACE(FORCEWAKE_ACK_VLV) & 1),
> +			       FORCEWAKE_ACK_TIMEOUT_US))
>  		DRM_ERROR("Force wake wait timed out\n");
>  
>  	__gen6_gt_wait_for_thread_c0(dev_priv);
> -- 
> 1.7.12
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

      parent reply	other threads:[~2012-09-03  8:38 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-02  5:59 [PATCH 1/4] drm/i915: Extract forcewake ack timeout Ben Widawsky
2012-09-02  5:59 ` [PATCH 2/4] drm/i915: use cpu_relax() in wait_for_atomic Ben Widawsky
2012-09-02  5:59 ` [PATCH 3/4] drm/i915: Change forcewake timeout to 2ms Ben Widawsky
2012-09-02  5:59 ` [PATCH 4/4 v2] drm/i915: Never read FORCEWAKE Ben Widawsky
2012-09-02  8:41   ` Chris Wilson
2012-09-03  8:30     ` Daniel Vetter
2012-09-03  8:42 ` Jani Nikula [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87oblna44x.fsf@intel.com \
    --to=jani.nikula@linux.intel.com \
    --cc=ben@bwidawsk.net \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox