From: Imre Deak <imre.deak@intel.com>
To: Vandana Kannan <vandana.kannan@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH v2 1/2] drm/i915/bxt: Port PLL programming BUN
Date: Thu, 07 May 2015 12:27:51 +0300 [thread overview]
Message-ID: <1430990871.8610.7.camel@intel.com> (raw)
In-Reply-To: <1430980259-5471-1-git-send-email-vandana.kannan@intel.com>
On to, 2015-05-07 at 12:00 +0530, Vandana Kannan wrote:
> BUN 1: prop_coeff, int_coeff, tdctargetcnt programming updated and tied to
> VCO frequencies. Program i_lockthresh in PORT_PLL_9.
>
> VCO calculated based on the formula:
> Desired Output = Port bit rate in MHz (DisplayPort HBR2 is 5400 MHz)
> Fast Clock = Desired Output / 2
> VCO = Fast Clock * P1 * P2
>
> Prop_coeff, int_coeff, and tdctargetcnt modified according to above
> calculation.
>
> BUN 2: Port PLLs require additional programming at certain frequencies -
> DCO amplitude in PORT_PLL_10
>
> Review comments from Siva which were addressed in the initial version of the
> patch.
> - Change PORT_PLL_LOCK_THRESHOLD to PORT_PLL_LOCK_THRESHOLD_MASK
> - Calculate for HDMI
> - Correct values for vco = 5.4
> - return in case of invalid vco range
>
> v2: Imre's review comments addressed
> - change dcoampovr_en to dcoampovr_en_h
> - change PORT_PLL_DCO_AMP_OVR_EN to PORT_PLL_DCO_AMP_OVR_EN_H
> - Correct lane stagger value for 324MHz
> - Make coef common for HDMI and DP
> - remove superfluous comments
>
> Signed-off-by: Vandana Kannan <vandana.kannan@intel.com>
> Reviewed-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>
> Cc: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 2 +-
> drivers/gpu/drm/i915/i915_reg.h | 6 ++++
> drivers/gpu/drm/i915/intel_ddi.c | 69 ++++++++++++++++++++++++++++++----------
> 3 files changed, 60 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 136d42a..05a4e1c 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -304,7 +304,7 @@ struct intel_dpll_hw_state {
> uint32_t cfgcr1, cfgcr2;
>
> /* bxt */
> - uint32_t ebb0, pll0, pll1, pll2, pll3, pll6, pll8, pcsdw12;
> + uint32_t ebb0, pll0, pll1, pll2, pll3, pll6, pll8, pll10, pcsdw12;
> };
>
> struct intel_shared_dpll_config {
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 1b31238..b086d26 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -1185,6 +1185,12 @@ enum skl_disp_power_wells {
> #define PORT_PLL_GAIN_CTL(x) ((x) << 16)
> /* PORT_PLL_8_A */
> #define PORT_PLL_TARGET_CNT_MASK 0x3FF
> +/* PORT_PLL_9_A */
> +#define PORT_PLL_LOCK_THRESHOLD_MASK 0xe
> +/* PORT_PLL_10_A */
> +#define PORT_PLL_DCO_AMP_OVR_EN_H (1<<27)
> +#define PORT_PLL_DCO_AMP_MASK 0x3c00
> +#define PORT_PLL_DCO_AMP(x) (x<<10)
> #define _PORT_PLL_BASE(port) _PORT3(port, _PORT_PLL_0_A, \
> _PORT_PLL_0_B, \
> _PORT_PLL_0_C)
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index 9c1e74a..49b9fd8 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -1337,18 +1337,20 @@ struct bxt_clk_div {
> uint32_t int_coef;
> uint32_t gain_ctl;
> uint32_t targ_cnt;
> + uint32_t dcoampovr_en_h;
> + uint32_t dco_amp;
> uint32_t lanestagger;
> };
>
> /* pre-calculated values for DP linkrates */
> static struct bxt_clk_div bxt_dp_clk_val[7] = {
> - /* 162 */ {4, 2, 32, 1677722, 1, 1, 5, 11, 2, 9, 0xd},
> - /* 270 */ {4, 1, 27, 0, 0, 1, 3, 8, 1, 9, 0xd},
> - /* 540 */ {2, 1, 27, 0, 0, 1, 3, 8, 1, 9, 0x18},
> - /* 216 */ {3, 2, 32, 1677722, 1, 1, 5, 11, 2, 9, 0xd},
> - /* 243 */ {4, 1, 24, 1258291, 1, 1, 5, 11, 2, 9, 0xd},
> - /* 324 */ {4, 1, 32, 1677722, 1, 1, 5, 11, 2, 9, 0xd},
> - /* 432 */ {3, 1, 32, 1677722, 1, 1, 5, 11, 2, 9, 0x18}
> + /* 162 */ {4, 2, 32, 1677722, 1, 1, 4, 9, 3, 8, 0, 15, 0xd},
> + /* 270 */ {4, 1, 27, 0, 0, 1, 3, 8, 1, 9, 0, 15, 0xd},
> + /* 540 */ {2, 1, 27, 0, 0, 1, 3, 8, 1, 9, 0, 15, 0x18},
> + /* 216 */ {3, 2, 32, 1677722, 1, 1, 4, 9, 3, 8, 0, 15, 0xd},
> + /* 243 */ {4, 1, 24, 1258291, 1, 1, 5, 11, 3, 9, 1, 15, 0xd},
> + /* 324 */ {4, 1, 32, 1677722, 1, 1, 4, 9, 3, 8, 0, 15, 0x18},
> + /* 432 */ {3, 1, 32, 1677722, 1, 1, 4, 9, 3, 8, 0, 15, 0x18}
We calculate all of prop_coef, int_coef, gain_ctl, targ_cnt,
dcoapovr_en_h, dco_amp, so no need to have fixed values for these. The
corresponding fields should be removed from bxt_clk_div and replaced
with local vars in bxt_ddi_pll_select.
> };
>
> static bool
> @@ -1359,6 +1361,7 @@ bxt_ddi_pll_select(struct intel_crtc *intel_crtc,
> {
> struct intel_shared_dpll *pll;
> struct bxt_clk_div clk_div = {0};
> + int vco = 0;
>
> if (intel_encoder->type == INTEL_OUTPUT_HDMI) {
> intel_clock_t best_clock;
> @@ -1382,11 +1385,7 @@ bxt_ddi_pll_select(struct intel_crtc *intel_crtc,
> clk_div.m2_frac = best_clock.m2 & ((1 << 22) - 1);
> clk_div.m2_frac_en = clk_div.m2_frac != 0;
>
> - /* FIXME: set coef, gain, targcnt based on freq band */
> - clk_div.prop_coef = 5;
> - clk_div.int_coef = 11;
> - clk_div.gain_ctl = 2;
> - clk_div.targ_cnt = 9;
> + vco = best_clock.vco;
> if (clock > 270000)
> clk_div.lanestagger = 0x18;
> else if (clock > 135000)
> @@ -1416,6 +1415,32 @@ bxt_ddi_pll_select(struct intel_crtc *intel_crtc,
> clk_div = bxt_dp_clk_val[0];
> DRM_ERROR("Unknown link rate\n");
> }
> + vco = clock * 10 / 2 * clk_div.p1 * clk_div.p2;
> + }
> +
> + clk_div.dco_amp = 15;
> + clk_div.dcoampovr_en_h = 0;
> + if (vco >= 6200000 && vco <= 6480000) {
> + clk_div.prop_coef = 4;
> + clk_div.int_coef = 9;
> + clk_div.gain_ctl = 3;
> + clk_div.targ_cnt = 8;
> + } else if ((vco > 5400000 && vco < 6200000) ||
> + (vco >= 4800000 && vco < 5400000)) {
> + clk_div.prop_coef = 5;
> + clk_div.int_coef = 11;
> + clk_div.gain_ctl = 3;
> + clk_div.targ_cnt = 9;
> + if (vco >= 4800000 && vco < 5400000)
> + clk_div.dcoampovr_en_h = 1;
> + } else if (vco == 5400000) {
> + clk_div.prop_coef = 3;
> + clk_div.int_coef = 8;
> + clk_div.gain_ctl = 1;
> + clk_div.targ_cnt = 9;
> + } else {
> + DRM_ERROR("Invalid VCO\n");
> + return false;
> }
>
> crtc_state->dpll_hw_state.ebb0 =
> @@ -1435,6 +1460,11 @@ bxt_ddi_pll_select(struct intel_crtc *intel_crtc,
>
> crtc_state->dpll_hw_state.pll8 = clk_div.targ_cnt;
>
> + if (clk_div.dcoampovr_en_h)
> + crtc_state->dpll_hw_state.pll10 = PORT_PLL_DCO_AMP_OVR_EN_H;
> +
> + crtc_state->dpll_hw_state.pll10 |= PORT_PLL_DCO_AMP(clk_div.dco_amp);
> +
> crtc_state->dpll_hw_state.pcsdw12 =
> LANESTAGGER_STRAP_OVRD | clk_div.lanestagger;
>
> @@ -2366,10 +2396,16 @@ static void bxt_ddi_pll_enable(struct drm_i915_private *dev_priv,
> temp |= pll->config.hw_state.pll8;
> I915_WRITE(BXT_PORT_PLL(port, 8), temp);
>
> - /*
> - * FIXME: program PORT_PLL_9/i_lockthresh according to the latest
> - * specification update.
> - */
> + temp = I915_READ(BXT_PORT_PLL(port, 9));
> + temp &= ~PORT_PLL_LOCK_THRESHOLD_MASK;
> + temp |= (5 << 1);
> + I915_WRITE(BXT_PORT_PLL(port, 9), temp);
> +
> + temp = I915_READ(BXT_PORT_PLL(port, 10));
> + temp &= ~PORT_PLL_DCO_AMP_OVR_EN_H;
> + temp &= ~PORT_PLL_DCO_AMP_MASK;
> + temp |= pll->config.hw_state.pll10;
> + I915_WRITE(BXT_PORT_PLL(port, 10), temp);
>
> /* Recalibrate with new settings */
> temp = I915_READ(BXT_PORT_PLL_EBB_4(port));
> @@ -2433,6 +2469,7 @@ static bool bxt_ddi_pll_get_hw_state(struct drm_i915_private *dev_priv,
> hw_state->pll3 = I915_READ(BXT_PORT_PLL(port, 3));
> hw_state->pll6 = I915_READ(BXT_PORT_PLL(port, 6));
> hw_state->pll8 = I915_READ(BXT_PORT_PLL(port, 8));
> + hw_state->pll10 = I915_READ(BXT_PORT_PLL(port, 10));
> /*
> * While we write to the group register to program all lanes at once we
> * can read only lane registers. We configure all lanes the same way, so
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-05-07 9:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-07 6:30 [PATCH v2 1/2] drm/i915/bxt: Port PLL programming BUN Vandana Kannan
2015-05-07 6:30 ` [PATCH 2/2] drm/i915/bxt: Move around lane stagger calculation Vandana Kannan
2015-05-07 13:07 ` Imre Deak
2015-05-13 6:50 ` [PATCH v2 " Vandana Kannan
2015-05-18 16:28 ` Imre Deak
2015-05-19 8:04 ` Daniel Vetter
2015-05-07 21:22 ` [PATCH " shuang.he
2015-05-07 9:27 ` Imre Deak [this message]
2015-05-11 14:39 ` [PATCH v2 1/2] drm/i915/bxt: Port PLL programming BUN Kannan, Vandana
2015-05-13 6:48 ` [PATCH v3 " Vandana Kannan
2015-05-18 16:26 ` Imre Deak
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=1430990871.8610.7.camel@intel.com \
--to=imre.deak@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=vandana.kannan@intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.