From: Ander Conselvan de Oliveira <conselvan2@gmail.com>
To: Bob Paauwe <bob.j.paauwe@intel.com>,
intel-gfx <intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH] drm/i915: Use correct pipe config to update pll dividers.
Date: Tue, 11 Nov 2014 11:16:43 +0200 [thread overview]
Message-ID: <5461D3FB.5040103@gmail.com> (raw)
In-Reply-To: <1415660963-17467-1-git-send-email-bob.j.paauwe@intel.com>
Hi Bob,
Thanks for the patch. Just a small comment below.
On 11/11/2014 01:09 AM, Bob Paauwe wrote:
> Use the new pipe config values to calculate the updated pll dividers.
>
> This regression was introduced in
>
> commit 0dbdf89f27b17ae1eceed6782c2917f74cbb5d59
> Author: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> Date: Wed Oct 29 11:32:33 2014 +0200
>
> drm/i915: Add infrastructure for choosing DPLLs before disabling crtcs
>
> and
>
> commit 00d958817dd3daaa452c221387ddaf23d1e4c06f
> Author: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> Date: Wed Oct 29 11:32:36 2014 +0200
>
> drm/i915: Covert remaining platforms to choose DPLLS before disabling CRTCs
>
> Signed-off-by: Bob Paauwe <bob.j.paauwe@intel.com>
> CC: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> CC: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index ff071a7..601641d 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -5730,24 +5730,24 @@ static void i9xx_update_pll_dividers(struct intel_crtc *crtc,
> u32 fp, fp2 = 0;
>
> if (IS_PINEVIEW(dev)) {
> - fp = pnv_dpll_compute_fp(&crtc->config.dpll);
> + fp = pnv_dpll_compute_fp(&crtc->new_config->dpll);
> if (reduced_clock)
> fp2 = pnv_dpll_compute_fp(reduced_clock);
> } else {
> - fp = i9xx_dpll_compute_fp(&crtc->config.dpll);
> + fp = i9xx_dpll_compute_fp(&crtc->new_config->dpll);
> if (reduced_clock)
> fp2 = i9xx_dpll_compute_fp(reduced_clock);
> }
>
> - crtc->config.dpll_hw_state.fp0 = fp;
> + crtc->new_config->dpll_hw_state.fp0 = fp;
>
> crtc->lowfreq_avail = false;
> if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) &&
This needs to be changed to intel_pipe_will_have_type(), so that it
looks at the new configuration instead of the current one. With that
fixed,
Reviewed-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> reduced_clock && i915.powersave) {
> - crtc->config.dpll_hw_state.fp1 = fp2;
> + crtc->new_config->dpll_hw_state.fp1 = fp2;
> crtc->lowfreq_avail = true;
> } else {
> - crtc->config.dpll_hw_state.fp1 = fp;
> + crtc->new_config->dpll_hw_state.fp1 = fp;
> }
> }
>
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2014-11-11 9:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-08 0:07 [PATCH] drm/i915: Don't initialize pipe config after choosing DPLLs Bob Paauwe
2014-11-08 8:55 ` [PATCH] drm/i915: Don't initialize pipe config after shuang.he
2014-11-10 10:40 ` [PATCH] drm/i915: Don't initialize pipe config after choosing DPLLs Ville Syrjälä
2014-11-10 22:50 ` Bob Paauwe
2014-11-10 23:09 ` [PATCH] drm/i915: Use correct pipe config to update pll dividers Bob Paauwe
2014-11-11 9:16 ` Ander Conselvan de Oliveira [this message]
2014-11-11 17:29 ` [PATCH] drm/i915: Use correct pipe config to update pll dividers. V2 Bob Paauwe
2014-11-11 18:34 ` Jesse Barnes
2014-11-12 9:23 ` Daniel Vetter
2014-11-12 14:08 ` [PATCH] drm/i915: Use correct pipe config to update pll shuang.he
2014-11-11 21:19 ` shuang.he
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=5461D3FB.5040103@gmail.com \
--to=conselvan2@gmail.com \
--cc=bob.j.paauwe@intel.com \
--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