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

Commit bfa04445 authored by Ander Conselvan de Oliveira's avatar Ander Conselvan de Oliveira
Browse files

drm/i915: Simplify ironlake reduced clock logic a bit 



Check has_reduced_clock only once when setting dpll_hw_state, making the
code slightly more readable.

Signed-off-by: default avatarAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1458576016-30348-6-git-send-email-ander.conselvan.de.oliveira@intel.com
parent 2d7feacc

drivers/gpu/drm/i915/intel_display.c

+3 −4
Original line number Diff line number Diff line
@@ -8832,6 +8832,8 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc, 
		fp = i9xx_dpll_compute_fp(&crtc_state->dpll);

		if (has_reduced_clock)

			fp2 = i9xx_dpll_compute_fp(&reduced_clock);

		else

			fp2 = fp;



		dpll = ironlake_compute_dpll(crtc, crtc_state,

					     &fp, &reduced_clock,
@@ -8839,10 +8841,7 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc, 


		crtc_state->dpll_hw_state.dpll = dpll;

		crtc_state->dpll_hw_state.fp0 = fp;

		if (has_reduced_clock)

		crtc_state->dpll_hw_state.fp1 = fp2;

		else

			crtc_state->dpll_hw_state.fp1 = fp;



		pll = intel_get_shared_dpll(crtc, crtc_state, NULL);

		if (pll == NULL) {