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

Commit fa7c13e5 authored by Imre Deak's avatar Imre Deak Committed by Jani Nikula
Browse files

drm/i915/hsw: Avoid early timeout during LCPLL disable/restore 



Since wait_for_atomic doesn't re-check the wait-for condition after
expiry of the timeout it can fail when called from non-atomic context
even if the condition is set correctly before the expiry. Fix this by
using the non-atomic wait_for instead.

Fixes: 0351b939 ("drm/i915: Do not lie about atomic timeout granularity")
CC: Chris Wilson <chris@chris-wilson.co.uk>
CC: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
CC: drm-intel-fixes@lists.freedesktop.org
Link: http://patchwork.freedesktop.org/patch/msgid/1467110253-16046-4-git-send-email-imre.deak@intel.com


(cherry picked from commit f53dd63f)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 11f61457

drivers/gpu/drm/i915/intel_display.c

+4 −4
Original line number Diff line number Diff line
@@ -9440,7 +9440,7 @@ static void hsw_disable_lcpll(struct drm_i915_private *dev_priv, 
		val |= LCPLL_CD_SOURCE_FCLK;

		I915_WRITE(LCPLL_CTL, val);



		if (wait_for_atomic_us(I915_READ(LCPLL_CTL) &

		if (wait_for_us(I915_READ(LCPLL_CTL) &

				LCPLL_CD_SOURCE_FCLK_DONE, 1))

			DRM_ERROR("Switching to FCLK failed\n");
@@ -9514,7 +9514,7 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv) 
		val &= ~LCPLL_CD_SOURCE_FCLK;

		I915_WRITE(LCPLL_CTL, val);



		if (wait_for_atomic_us((I915_READ(LCPLL_CTL) &

		if (wait_for_us((I915_READ(LCPLL_CTL) &

				 LCPLL_CD_SOURCE_FCLK_DONE) == 0, 1))

			DRM_ERROR("Switching back to LCPLL failed\n");

	}