Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-16 18:08:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/i915: vlv: increase timeout when forcing on the GFX clock

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

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Imre Deak 2014-04-14 20:24:43 +03:00 committed by Daniel Vetter
parent 650ad970a3
commit 8d4eee9cd7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/i915_drv.c
View File

@ -944,7 +944,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) #define COND (I915_READ(VLV_GTLC_SURVIVABILITY_REG) & VLV_GFX_CLK_STATUS_BIT)
/* Wait for a previous force-off to settle */ /* Wait for a previous force-off to settle */
if (force_on) { if (force_on) {
err = wait_for(!COND, 5); err = wait_for(!COND, 20);
if (err) { if (err) {
DRM_ERROR("timeout waiting for GFX clock force-off (%08x)\n", DRM_ERROR("timeout waiting for GFX clock force-off (%08x)\n",
I915_READ(VLV_GTLC_SURVIVABILITY_REG)); I915_READ(VLV_GTLC_SURVIVABILITY_REG));
@ -961,7 +961,7 @@ int vlv_force_gfx_clock(struct drm_i915_private *dev_priv, bool force_on)
if (!force_on) if (!force_on)
return 0; return 0;
err = wait_for(COND, 5); err = wait_for(COND, 20);
if (err) if (err)
DRM_ERROR("timeout waiting for GFX clock force-on (%08x)\n", DRM_ERROR("timeout waiting for GFX clock force-on (%08x)\n",
I915_READ(VLV_GTLC_SURVIVABILITY_REG)); I915_READ(VLV_GTLC_SURVIVABILITY_REG));