summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorImre Deak2014-11-19 15:25:38 +0100
committerDaniel Vetter2014-11-20 16:58:29 +0100
commit2837ac40698d0931727b957a40c8c8ea27c3bcb2 (patch)
tree672c54cb25a2b34fbaf00de5e0bdf260120719c1
parentdrm/i915: vlv: fix cdclk setting during modeset while suspended (diff)
downloadkernel-qcow2-linux-2837ac40698d0931727b957a40c8c8ea27c3bcb2.tar.gz
kernel-qcow2-linux-2837ac40698d0931727b957a40c8c8ea27c3bcb2.tar.xz
kernel-qcow2-linux-2837ac40698d0931727b957a40c8c8ea27c3bcb2.zip
drm/i915: vlv: increase timeout when setting idle GPU freq
I saw punit timeouts in vlv_set_rps_idle() while running various subtests of pm_rpm. Increasing the timeout to 100ms got rid of the issue. Testcase: igt/pm_rpm Reference: https://bugs.freedesktop.org/show_bug.cgi?id=82939 Signed-off-by: Imre Deak <imre.deak@intel.com> Tested-by: Guo Jinxian <jinxianx.guo@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index f103ffffc599..14f34f0358c0 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4451,7 +4451,7 @@ static void vlv_set_rps_idle(struct drm_i915_private *dev_priv)
dev_priv->rps.min_freq_softlimit);
if (wait_for(((vlv_punit_read(dev_priv, PUNIT_REG_GPU_FREQ_STS))
- & GENFREQSTATUS) == 0, 5))
+ & GENFREQSTATUS) == 0, 100))
DRM_ERROR("timed out waiting for Punit\n");
vlv_force_gfx_clock(dev_priv, false);