From: Daniel Vetter Subject: Re: [PATCH 3/3] drm/i915: Never read FORCEWAKE Date: Fri, 24 Aug 2012 21:48:45 +0200 Message-ID: <20120824194845.GJ5371@phenom.ffwll.local> References: <1345836671-1180-1-git-send-email-ben@bwidawsk.net> <1345836671-1180-4-git-send-email-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTP id D451FA0F57 for ; Fri, 24 Aug 2012 12:48:22 -0700 (PDT) Received: by wibhn17 with SMTP id hn17so1005533wib.12 for ; Fri, 24 Aug 2012 12:48:21 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1345836671-1180-4-git-send-email-ben@bwidawsk.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: Ben Widawsky Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Aug 24, 2012 at 12:31:11PM -0700, Ben Widawsky wrote: > The same designer from the previous patch has told us to never read > FORCEWAKE. We only do this for the POSTING_READ(), so simply change that > to something within the same cacheline (for no reason in particular > other than it sounds nice). In the _mt case we can leverage > the gtfifodbg check for the POSTING_READ. > > Signed-off-by: Ben Widawsky This partially reverts commit 6af2d180f82151cf3d58952e35a4f96e45bc453a Author: Daniel Vetter Date: Thu Jul 26 16:24:50 2012 +0200 drm/i915: fix forcewake related hangs on snb I guess the commit message should mention that. Also, please add a comment it the _put functions that the check_fifodbg serves as a posting read (and that we have experimental evidence suggesting that we should readback something "nearby"). btw, can you please ask your nice designer whether he has any clue whether that "nearby" posting_read has an effect? Thanks, Daniel > --- > drivers/gpu/drm/i915/intel_pm.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 2a8468d..83ec02c 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -3975,7 +3975,7 @@ static void __gen6_gt_force_wake_get(struct drm_i915_private *dev_priv) > DRM_ERROR("Force wake wait timed out\n"); > > I915_WRITE_NOTRACE(FORCEWAKE, 1); > - POSTING_READ(FORCEWAKE); > + POSTING_READ(ECOBUS); /* something from same cacheline, but !FORCEWAKE */ > > if (wait_for_atomic((I915_READ_NOTRACE(forcewake_ack) & 1), > FORCEWAKE_ACK_TIMEOUT_MS)) > @@ -3998,7 +3998,7 @@ static void __gen6_gt_force_wake_mt_get(struct drm_i915_private *dev_priv) > DRM_ERROR("Force wake wait timed out\n"); > > I915_WRITE_NOTRACE(FORCEWAKE_MT, _MASKED_BIT_ENABLE(1)); > - POSTING_READ(FORCEWAKE_MT); > + POSTING_READ(ECOBUS); /* something from same cacheline, but !FORCEWAKE */ > > if (wait_for_atomic((I915_READ_NOTRACE(forcewake_ack) & 1), > FORCEWAKE_ACK_TIMEOUT_MS)) > @@ -4035,14 +4035,12 @@ void gen6_gt_check_fifodbg(struct drm_i915_private *dev_priv) > static void __gen6_gt_force_wake_put(struct drm_i915_private *dev_priv) > { > I915_WRITE_NOTRACE(FORCEWAKE, 0); > - POSTING_READ(FORCEWAKE); > gen6_gt_check_fifodbg(dev_priv); > } > > static void __gen6_gt_force_wake_mt_put(struct drm_i915_private *dev_priv) > { > I915_WRITE_NOTRACE(FORCEWAKE_MT, _MASKED_BIT_DISABLE(1)); > - POSTING_READ(FORCEWAKE_MT); > gen6_gt_check_fifodbg(dev_priv); > } > > -- > 1.7.12 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48