On Fri, Mar 08, 2013 at 10:45:57AM -0800, Jesse Barnes wrote: > We could split this out into a separate routine at some point as an > optimization. > > v2: use FORCEWAKE_KERNEL (Ville) > > Signed-off-by: Jesse Barnes <[email protected]>
Reviewed-by: Ville Syrjälä <[email protected]> With the understanding that no one gets to blame me if the magic same cacheline register trick turns out to be necessary after all ;) > --- > drivers/gpu/drm/i915/i915_reg.h | 2 ++ > drivers/gpu/drm/i915/intel_pm.c | 12 +++++++++--- > 2 files changed, 11 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 1877d0e..07a1333 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -4266,6 +4266,8 @@ > #define FORCEWAKE 0xA18C > #define FORCEWAKE_VLV 0x1300b0 > #define FORCEWAKE_ACK_VLV 0x1300b4 > +#define FORCEWAKE_MEDIA_VLV 0x1300b8 > +#define FORCEWAKE_ACK_MEDIA_VLV 0x1300bc > #define FORCEWAKE_ACK_HSW 0x130044 > #define FORCEWAKE_ACK 0x130090 > #define VLV_GTLC_WAKE_CTRL 0x130090 > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index d2499eb..70eab45 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -4415,10 +4415,16 @@ static void vlv_force_wake_get(struct > drm_i915_private *dev_priv) > DRM_ERROR("Timed out waiting for forcewake old ack to > clear.\n"); > > I915_WRITE_NOTRACE(FORCEWAKE_VLV, _MASKED_BIT_ENABLE(FORCEWAKE_KERNEL)); > + I915_WRITE_NOTRACE(FORCEWAKE_MEDIA_VLV, > _MASKED_BIT_ENABLE(FORCEWAKE_KERNEL)); > > if (wait_for_atomic((I915_READ_NOTRACE(FORCEWAKE_ACK_VLV) & > FORCEWAKE_KERNEL), > FORCEWAKE_ACK_TIMEOUT_MS)) > - DRM_ERROR("Timed out waiting for forcewake to ack request.\n"); > + DRM_ERROR("Timed out waiting for GT to ack forcewake > request.\n"); > + > + if (wait_for_atomic((I915_READ_NOTRACE(FORCEWAKE_ACK_MEDIA_VLV) & > + FORCEWAKE_KERNEL), > + FORCEWAKE_ACK_TIMEOUT_MS)) > + DRM_ERROR("Timed out waiting for media to ack forcewake > request.\n"); > > __gen6_gt_wait_for_thread_c0(dev_priv); > } > @@ -4426,8 +4432,8 @@ static void vlv_force_wake_get(struct drm_i915_private > *dev_priv) > static void vlv_force_wake_put(struct drm_i915_private *dev_priv) > { > I915_WRITE_NOTRACE(FORCEWAKE_VLV, > _MASKED_BIT_DISABLE(FORCEWAKE_KERNEL)); > - /* something from same cacheline, but !FORCEWAKE_VLV */ > - POSTING_READ(FORCEWAKE_ACK_VLV); > + I915_WRITE_NOTRACE(FORCEWAKE_MEDIA_VLV, > _MASKED_BIT_DISABLE(FORCEWAKE_KERNEL)); > + /* The below doubles as a POSTING_READ */ > gen6_gt_check_fifodbg(dev_priv); > } > > -- > 1.7.10.4 > > _______________________________________________ > Intel-gfx mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
