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

Commit 7d0ac5b7 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: fix lost FP_CB_TUNE setting for pch plls 



commit de13a2e3
Author: Paulo Zanoni <paulo.r.zanoni@intel.com>
Date:   Thu Sep 20 18:36:05 2012 -0300

    drm/i915: extract compute_dpll from ironlake_crtc_mode_set

missed the subtle adjustment of the FP1 register. Fix this up by
passing a pointer around instead of the value.

Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 7a7d1fb7

drivers/gpu/drm/i915/intel_display.c

+3 −3
Original line number Diff line number Diff line
@@ -5469,7 +5469,7 @@ static void ironlake_fdi_set_m_n(struct drm_crtc *crtc) 
}



static uint32_t ironlake_compute_dpll(struct intel_crtc *intel_crtc,

				      intel_clock_t *clock, u32 fp)

				      intel_clock_t *clock, u32 *fp)

{

	struct drm_crtc *crtc = &intel_crtc->base;

	struct drm_device *dev = crtc->dev;
@@ -5509,7 +5509,7 @@ static uint32_t ironlake_compute_dpll(struct intel_crtc *intel_crtc, 
		factor = 20;



	if (clock->m < factor * clock->n)

		fp |= FP_CB_TUNE;

		*fp |= FP_CB_TUNE;



	dpll = 0;
@@ -5626,7 +5626,7 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, 
		fp2 = reduced_clock.n << 16 | reduced_clock.m1 << 8 |

			reduced_clock.m2;



	dpll = ironlake_compute_dpll(intel_crtc, &clock, fp);

	dpll = ironlake_compute_dpll(intel_crtc, &clock, &fp);



	DRM_DEBUG_KMS("Mode for pipe %d:\n", pipe);

	drm_mode_debug_printmodeline(mode);