Re: [Intel-gfx] [PATCH] drm/i915: Don't take fp 0/1 selector into account for pll state

Ville Syrjälä
2014-06-16T08:32:39Z

On Sun, Jun 15, 2014 at 02:55:42PM +0200, Daniel Vetter wrote:
> It changes at runtime and so should be ignored for pipe state checks.
> Note that we don't yet read out the full DRRS state, so there's some
> gaps. Bu DRRS is also not yet enabled for LVDS by default.
>
> Cc: Aleks <aleks@slobodensoftver.org.mk>
> Reported-by: Aleks <aleks@slobodensoftver.org.mk>
> Cc: stable@vger.kernel.org
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/i915/intel_display.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index ba1d9aac3958..1ccf660e67d9 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -8549,6 +8549,9 @@ static void i9xx_crtc_clock_get(struct intel_crtc *crtc,
> else
> fp = pipe_config->dpll_hw_state.fp1;
>
> + /* We don't compute the FPA 0/1 selector. */
> + dpll &= ~DISPLAY_RATE_SELECT_FPA1;
> +

But we still compute port_clock based on the currently active FPA
register. Won't that make the clock checks fail as well?

> clock.m1 = (fp & FP_M1_DIV_MASK) >> FP_M1_DIV_SHIFT;
> if (IS_PINEVIEW(dev)) {
> clock.n = ffs((fp & FP_N_PINEVIEW_DIV_MASK) >> FP_N_DIV_SHIFT) - 1;
> --
> 2.0.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

--
Ville Syrjälä
Intel OTC