From: Daniel Vetter Subject: Re: [PATCH] [v2] drm/i915/bdw: Add 42ms delay for IPS disable Date: Fri, 11 Apr 2014 11:12:30 +0200 Message-ID: <20140411091230.GB9262@phenom.ffwll.local> References: <1397153057-23439-1-git-send-email-benjamin.widawsky@intel.com> <1397165561-3288-1-git-send-email-benjamin.widawsky@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f52.google.com (mail-ee0-f52.google.com [74.125.83.52]) by gabe.freedesktop.org (Postfix) with ESMTP id DB6E06ED55 for ; Fri, 11 Apr 2014 02:12:33 -0700 (PDT) Received: by mail-ee0-f52.google.com with SMTP id e49so3904743eek.11 for ; Fri, 11 Apr 2014 02:12:32 -0700 (PDT) Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: "Runyan, Arthur J" Cc: Ben Widawsky , Intel GFX , "Widawsky, Benjamin" List-Id: intel-gfx@lists.freedesktop.org On Thu, Apr 10, 2014 at 11:38:21PM +0000, Runyan, Arthur J wrote: > Ben explained some of the fine details of the code to me, and I'm happy. > Reviewed-by: Art Runyan > > > > >From: Ben Widawsky > > > >This is a requirement added to the spec. This patch will prevent > >persistent corruption on the display. > > > >v2: Make the wait before the vblank wait. (Art) > >Try to finish early by polling the register > >s/present/prevent (Chris) > > > >Cc: Art Runyan > >Signed-off-by: Ben Widawsky Queued for -next, thanks for the patch. > >--- > > drivers/gpu/drm/i915/intel_display.c | 5 ++++- > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > >diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > >index 7f02444..05c60b1 100644 > >--- a/drivers/gpu/drm/i915/intel_display.c > >+++ b/drivers/gpu/drm/i915/intel_display.c > >@@ -3583,10 +3583,13 @@ void hsw_disable_ips(struct intel_crtc *crtc) > > return; > > > > assert_plane_enabled(dev_priv, crtc->plane); > >- if (IS_BROADWELL(crtc->base.dev)) { > >+ if (IS_BROADWELL(dev)) { > > mutex_lock(&dev_priv->rps.hw_lock); > > WARN_ON(sandybridge_pcode_write(dev_priv, DISPLAY_IPS_CONTROL, > >0)); > > mutex_unlock(&dev_priv->rps.hw_lock); > >+ /* wait for pcode to finish disabling IPS, which may take up to 42ms */ > >+ if (wait_for((I915_READ(IPS_CTL) & IPS_ENABLE) == 0, 42)) > >+ DRM_DEBUG_KMS("Timed out waiting for IPS disable\n"); I've upgraded this to an ERROR to make sure we'll get noticed if it happens. -Daniel > > } else { > > I915_WRITE(IPS_CTL, 0); > > POSTING_READ(IPS_CTL); > >-- > >1.9.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch