Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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>

authored by

Imre Deak and committed by
Daniel Vetter
8d4eee9c 650ad970

+2 -2
+2 -2
drivers/gpu/drm/i915/i915_drv.c
··· 944 944 #define COND (I915_READ(VLV_GTLC_SURVIVABILITY_REG) & VLV_GFX_CLK_STATUS_BIT) 945 945 /* Wait for a previous force-off to settle */ 946 946 if (force_on) { 947 - err = wait_for(!COND, 5); 947 + err = wait_for(!COND, 20); 948 948 if (err) { 949 949 DRM_ERROR("timeout waiting for GFX clock force-off (%08x)\n", 950 950 I915_READ(VLV_GTLC_SURVIVABILITY_REG)); ··· 961 961 if (!force_on) 962 962 return 0; 963 963 964 - err = wait_for(COND, 5); 964 + err = wait_for(COND, 20); 965 965 if (err) 966 966 DRM_ERROR("timeout waiting for GFX clock force-on (%08x)\n", 967 967 I915_READ(VLV_GTLC_SURVIVABILITY_REG));