Re: [Intel-gfx] [PATCH v2 22/25] drm/i915: vlv: increase timeout when forcing on the GFX clock

[Daniel Vetter]

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 imre.d...@intel.com

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
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH v2 22/25] drm/i915: vlv: increase timeout when forcing on the GFX clock

[Imre Deak]

I've seen latencies up to 15msec, so increase the timeout to 20msec.

Signed-off-by: Imre Deak imre.d...@intel.com
---
 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