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

Commit 92a68031 authored by Imre Deak's avatar Imre Deak Committed by Rodrigo Vivi
Browse files

drm/i915/bdw: Increase IPS disable timeout to 100ms 

During IPS disabling the current 42ms timeout value leads to occasional
timeouts, increase it to 100ms which seems to get rid of the problem.

References: https://bugs.freedesktop.org/show_bug.cgi?id=107494
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107562


Reported-by: default avatarDiego Viola <diego.viola@gmail.com>
Tested-by: default avatarDiego Viola <diego.viola@gmail.com>
Cc: Diego Viola <diego.viola@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180905100005.7663-1-imre.deak@intel.com


(cherry picked from commit acb3ef0ee40ea657280a4a11d9f60eb2937c0dca)
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 11da3a7f

drivers/gpu/drm/i915/intel_display.c

+6 −2
Original line number Diff line number Diff line
@@ -5079,10 +5079,14 @@ void hsw_disable_ips(const struct intel_crtc_state *crtc_state) 
		mutex_lock(&dev_priv->pcu_lock);

		WARN_ON(sandybridge_pcode_write(dev_priv, DISPLAY_IPS_CONTROL, 0));

		mutex_unlock(&dev_priv->pcu_lock);

		/* wait for pcode to finish disabling IPS, which may take up to 42ms */

		/*

		 * Wait for PCODE to finish disabling IPS. The BSpec specified

		 * 42ms timeout value leads to occasional timeouts so use 100ms

		 * instead.

		 */

		if (intel_wait_for_register(dev_priv,

					    IPS_CTL, IPS_ENABLE, 0,

					    42))

					    100))

			DRM_ERROR("Timed out waiting for IPS disable\n");

	} else {

		I915_WRITE(IPS_CTL, 0);