Re: [PATCH 02/14] drm/i915: Use adjusted_mode->clock in lpt_program_iclkip

Damien Lespiau
2013-09-10T14:41:31Z

On Wed, Sep 04, 2013 at 06:25:19PM +0300, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> lpt_program_iclkip() wants to know the pixel clock. It should get that
> information from adjusted_mode, not crtc->mode.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>

--
Damien

> ---
> drivers/gpu/drm/i915/intel_display.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 2c450fe..fd67758 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -2875,6 +2875,7 @@ static void lpt_program_iclkip(struct drm_crtc *crtc)
> {
> struct drm_device *dev = crtc->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> + int clock = to_intel_crtc(crtc)->config.adjusted_mode.clock;
> u32 divsel, phaseinc, auxdiv, phasedir = 0;
> u32 temp;
>
> @@ -2892,13 +2893,13 @@ static void lpt_program_iclkip(struct drm_crtc *crtc)
> SBI_ICLK);
>
> /* 20MHz is a corner case which is out of range for the 7-bit divisor */
> - if (crtc->mode.clock == 20000) {
> + if (clock == 20000) {
> auxdiv = 1;
> divsel = 0x41;
> phaseinc = 0x20;
> } else {
> /* The iCLK virtual clock root frequency is in MHz,
> - * but the crtc->mode.clock in in KHz. To get the divisors,
> + * but the adjusted_mode->clock in in KHz. To get the divisors,
> * it is necessary to divide one by another, so we
> * convert the virtual clock precision to KHz here for higher
> * precision.
> @@ -2907,7 +2908,7 @@ static void lpt_program_iclkip(struct drm_crtc *crtc)
> u32 iclk_pi_range = 64;
> u32 desired_divisor, msb_divisor_value, pi_value;
>
> - desired_divisor = (iclk_virtual_root_freq / crtc->mode.clock);
> + desired_divisor = (iclk_virtual_root_freq / clock);
> msb_divisor_value = desired_divisor / iclk_pi_range;
> pi_value = desired_divisor % iclk_pi_range;
>
> @@ -2923,7 +2924,7 @@ static void lpt_program_iclkip(struct drm_crtc *crtc)
> ~SBI_SSCDIVINTPHASE_INCVAL_MASK);
>
> DRM_DEBUG_KMS("iCLKIP clock: found settings for %dKHz refresh rate: auxdiv=%x, divsel=%x, phasedir=%x, phaseinc=%x\n",
> - crtc->mode.clock,
> + clock,
> auxdiv,
> divsel,
> phasedir,
> --
> 1.8.1.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx