Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d4eee9c authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter
Browse files

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: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 650ad970

drivers/gpu/drm/i915/i915_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

	/* Wait for a previous force-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));
@@ -961,7 +961,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));