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

Commit 5ba00178 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Do not wait atomically for display clocks 



Looks like this code does not need to wait atomically since it
otherwise takes the mutex.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1457015805-23742-1-git-send-email-tvrtko.ursulin@linux.intel.com
parent 0351b939

drivers/gpu/drm/i915/intel_display.c

+4 −4
Original line number Diff line number Diff line
@@ -9857,7 +9857,7 @@ static void broadwell_set_cdclk(struct drm_device *dev, int cdclk) 
	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");
@@ -9892,7 +9892,7 @@ static void broadwell_set_cdclk(struct drm_device *dev, int cdclk) 
	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");