public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 3/8] drm/i915: Eliminate crtc->config from VLV/CHV DPLL functions
Date: Wed, 13 Sep 2017 18:18:59 +0300	[thread overview]
Message-ID: <20170913151859.GR4914@intel.com> (raw)
In-Reply-To: <150531364016.4880.5425161613975422889@mail.alporthouse.com>

On Wed, Sep 13, 2017 at 03:40:40PM +0100, Chris Wilson wrote:
> Quoting Ville Syrjala (2017-09-13 15:08:55)
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > Use the passed in crtc state rather than crtc->config when configuring
> > the DPLL on VLV/CHV.
> > 
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_display.c | 14 +++++++-------
> >  1 file changed, 7 insertions(+), 7 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index ef836fe3eacd..23fead59b825 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -5831,11 +5831,11 @@ static void valleyview_crtc_enable(struct intel_crtc_state *pipe_config,
> >         intel_encoders_pre_pll_enable(crtc, pipe_config, old_state);
> 
> Missed intel_crtc_has_dp_encoder(intel_crtc->config) ?

I was only going after the DPLL stuff. There's plenty more left.

> >  
> >         if (IS_CHERRYVIEW(dev_priv)) {
> > -               chv_prepare_pll(intel_crtc, intel_crtc->config);
> > -               chv_enable_pll(intel_crtc, intel_crtc->config);
> > +               chv_prepare_pll(intel_crtc, pipe_config);
> > +               chv_enable_pll(intel_crtc, pipe_config);
> >         } else {
> > -               vlv_prepare_pll(intel_crtc, intel_crtc->config);
> > -               vlv_enable_pll(intel_crtc, intel_crtc->config);
> > +               vlv_prepare_pll(intel_crtc, pipe_config);
> > +               vlv_enable_pll(intel_crtc, pipe_config);
> >         }
> >  
> >         intel_encoders_pre_enable(crtc, pipe_config, old_state);
> > @@ -6735,8 +6735,8 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
> >  
> >         /* Set HBR and RBR LPF coefficients */
> >         if (pipe_config->port_clock == 162000 ||
> > -           intel_crtc_has_type(crtc->config, INTEL_OUTPUT_ANALOG) ||
> > -           intel_crtc_has_type(crtc->config, INTEL_OUTPUT_HDMI))
> > +           intel_crtc_has_type(pipe_config, INTEL_OUTPUT_ANALOG) ||
> > +           intel_crtc_has_type(pipe_config, INTEL_OUTPUT_HDMI))
> >                 vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW10(pipe),
> >                                  0x009f0003);
> >         else
> > @@ -6763,7 +6763,7 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
> >  
> >         coreclk = vlv_dpio_read(dev_priv, pipe, VLV_PLL_DW7(pipe));
> >         coreclk = (coreclk & 0x0000ff00) | 0x01c00000;
> > -       if (intel_crtc_has_dp_encoder(crtc->config))
> > +       if (intel_crtc_has_dp_encoder(pipe_config))
> >                 coreclk |= 0x01000000;
> >         vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW7(pipe), coreclk);

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2017-09-13 15:19 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-13 14:08 [PATCH 0/8] drm/i915: Some DPLL crtc->state/config cleanups etc Ville Syrjala
2017-09-13 14:08 ` [PATCH 1/8] drm/i915: Set output_types to EDP for vlv/chv DPLL forcing Ville Syrjala
2017-09-13 14:08 ` [PATCH 2/8] drm/i915: Parametrize CBR_DPLLBMD_PIPE defines Ville Syrjala
2017-09-13 14:38   ` Chris Wilson
2017-09-13 14:08 ` [PATCH 3/8] drm/i915: Eliminate crtc->config from VLV/CHV DPLL functions Ville Syrjala
2017-09-13 14:40   ` Chris Wilson
2017-09-13 15:18     ` Ville Syrjälä [this message]
2017-09-13 14:08 ` [PATCH 4/8] drm/i915: Pass crtc state to i9xx_enable_pll() Ville Syrjala
2017-09-13 14:41   ` Chris Wilson
2017-09-13 15:20     ` Ville Syrjälä
2017-09-13 14:08 ` [PATCH 5/8] drm/i915: Nuke the bogus kernel doc for i9xx_disable_pll() Ville Syrjala
2017-09-13 14:42   ` Chris Wilson
2017-09-13 14:08 ` [PATCH 6/8] drm/i915: Add for_each_oldnew_intel_crtc_in_state() Ville Syrjala
2017-09-13 14:08 ` [PATCH 7/8] drm/i915: Shrink active_crtcs and active_pipes_changed to u8 Ville Syrjala
2017-09-13 14:49   ` Chris Wilson
2017-09-13 16:30     ` Ville Syrjälä
2017-09-13 14:09 ` [PATCH 8/8] drm/i915: Eliminate crtc->state usage from DVO pipe tracking Ville Syrjala
2017-09-13 14:51   ` Chris Wilson
2017-09-13 14:37 ` ✓ Fi.CI.BAT: success for drm/i915: Some DPLL crtc->state/config cleanups etc Patchwork
2017-09-14  1:04 ` ✗ Fi.CI.IGT: failure " Patchwork
2017-10-10 15:47 ` [PATCH 0/8] " Ville Syrjälä

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170913151859.GR4914@intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=chris@chris-wilson.co.uk \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox