| Message ID | 1346565590-1760-1-git-send-email-ben@bwidawsk.net (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
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
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);
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> --- drivers/gpu/drm/i915/intel_pm.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)