From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH v2 22/25] drm/i915: vlv: increase timeout when forcing on the GFX clock Date: Fri, 25 Apr 2014 16:04:27 +0200 Message-ID: <20140425140427.GS26374@phenom.ffwll.local> References: <1397496286-29649-1-git-send-email-imre.deak@intel.com> <1397496286-29649-23-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f42.google.com (mail-ee0-f42.google.com [74.125.83.42]) by gabe.freedesktop.org (Postfix) with ESMTP id 71DF26E19B for ; Fri, 25 Apr 2014 07:04:32 -0700 (PDT) Received: by mail-ee0-f42.google.com with SMTP id d17so2873427eek.29 for ; Fri, 25 Apr 2014 07:04:31 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1397496286-29649-23-git-send-email-imre.deak@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Imre Deak Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Mon, Apr 14, 2014 at 08:24:43PM +0300, Imre Deak wrote: > I've seen latencies up to 15msec, so increase the timeout to 20msec. > > Signed-off-by: Imre Deak Merged up to this patch here, thanks. -Daniel > --- > drivers/gpu/drm/i915/i915_drv.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 0609f77..845e1e1 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -916,7 +916,7 @@ int vlv_force_gfx_clock(struct drm_i915_private *dev_priv, bool force_on) > #define COND (I915_READ(VLV_GTLC_SURVIVABILITY_REG) & VLV_GFX_CLK_STATUS_BIT) > /* Wait for a previous force on/off to settle */ > if (force_on) { > - err = wait_for(!COND, 5); > + err = wait_for(!COND, 20); > if (err) { > DRM_ERROR("timeout waiting for GFX clock force-off (%08x)\n", > I915_READ(VLV_GTLC_SURVIVABILITY_REG)); > @@ -933,7 +933,7 @@ int vlv_force_gfx_clock(struct drm_i915_private *dev_priv, bool force_on) > if (!force_on) > return 0; > > - err = wait_for(COND, 5); > + err = wait_for(COND, 20); > if (err) > DRM_ERROR("timeout waiting for GFX clock force-on (%08x)\n", > I915_READ(VLV_GTLC_SURVIVABILITY_REG)); > -- > 1.8.4 > > _______________________________________________ > 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