From: Imre Deak <imre.deak@intel.com>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH 08/15] drm/i915: move intel_crtc->fdi_lanes to pipe_config
Date: Mon, 29 Apr 2013 13:17:38 +0300 [thread overview]
Message-ID: <1367230658.6390.45.camel@intelbox> (raw)
In-Reply-To: <1366363487-15926-9-git-send-email-daniel.vetter@ffwll.ch>
On Fri, 2013-04-19 at 11:24 +0200, Daniel Vetter wrote:
> We need this for two reasons:
> - Correct handling of shared fdi lanes on ivb with fastboot.
> - Handling fdi link bw limits when we only have two fdi lanes by
> dithering down a bit.
>
> Just search&replace in this patch, no functional change at all.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Imre Deak <imre.deak@intel.com>
> ---
> drivers/gpu/drm/i915/intel_ddi.c | 7 ++++---
> drivers/gpu/drm/i915/intel_display.c | 36 ++++++++++++++++++------------------
> drivers/gpu/drm/i915/intel_drv.h | 4 +++-
> 3 files changed, 25 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index e14fe5f..2e12ee7 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -181,7 +181,8 @@ void hsw_fdi_link_train(struct drm_crtc *crtc)
>
> /* Enable the PCH Receiver FDI PLL */
> rx_ctl_val = dev_priv->fdi_rx_config | FDI_RX_ENHANCE_FRAME_ENABLE |
> - FDI_RX_PLL_ENABLE | ((intel_crtc->fdi_lanes - 1) << 19);
> + FDI_RX_PLL_ENABLE |
> + ((intel_crtc->config.fdi_lanes - 1) << 19);
> I915_WRITE(_FDI_RXA_CTL, rx_ctl_val);
> POSTING_READ(_FDI_RXA_CTL);
> udelay(220);
> @@ -209,7 +210,7 @@ void hsw_fdi_link_train(struct drm_crtc *crtc)
> * port reversal bit */
> I915_WRITE(DDI_BUF_CTL(PORT_E),
> DDI_BUF_CTL_ENABLE |
> - ((intel_crtc->fdi_lanes - 1) << 1) |
> + ((intel_crtc->config.fdi_lanes - 1) << 1) |
> hsw_ddi_buf_ctl_values[i / 2]);
> POSTING_READ(DDI_BUF_CTL(PORT_E));
>
> @@ -1022,7 +1023,7 @@ void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc)
>
> } else if (type == INTEL_OUTPUT_ANALOG) {
> temp |= TRANS_DDI_MODE_SELECT_FDI;
> - temp |= (intel_crtc->fdi_lanes - 1) << 1;
> + temp |= (intel_crtc->config.fdi_lanes - 1) << 1;
>
> } else if (type == INTEL_OUTPUT_DISPLAYPORT ||
> type == INTEL_OUTPUT_EDP) {
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index c2579c0..7cb1abf 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -2432,7 +2432,7 @@ static void ironlake_fdi_link_train(struct drm_crtc *crtc)
> reg = FDI_TX_CTL(pipe);
> temp = I915_READ(reg);
> temp &= ~(7 << 19);
> - temp |= (intel_crtc->fdi_lanes - 1) << 19;
> + temp |= (intel_crtc->config.fdi_lanes - 1) << 19;
> temp &= ~FDI_LINK_TRAIN_NONE;
> temp |= FDI_LINK_TRAIN_PATTERN_1;
> I915_WRITE(reg, temp | FDI_TX_ENABLE);
> @@ -2530,7 +2530,7 @@ static void gen6_fdi_link_train(struct drm_crtc *crtc)
> reg = FDI_TX_CTL(pipe);
> temp = I915_READ(reg);
> temp &= ~(7 << 19);
> - temp |= (intel_crtc->fdi_lanes - 1) << 19;
> + temp |= (intel_crtc->config.fdi_lanes - 1) << 19;
> temp &= ~FDI_LINK_TRAIN_NONE;
> temp |= FDI_LINK_TRAIN_PATTERN_1;
> temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK;
> @@ -2665,7 +2665,7 @@ static void ivb_manual_fdi_link_train(struct drm_crtc *crtc)
> reg = FDI_TX_CTL(pipe);
> temp = I915_READ(reg);
> temp &= ~(7 << 19);
> - temp |= (intel_crtc->fdi_lanes - 1) << 19;
> + temp |= (intel_crtc->config.fdi_lanes - 1) << 19;
> temp &= ~(FDI_LINK_TRAIN_AUTO | FDI_LINK_TRAIN_NONE_IVB);
> temp |= FDI_LINK_TRAIN_PATTERN_1_IVB;
> temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK;
> @@ -2767,7 +2767,7 @@ static void ironlake_fdi_pll_enable(struct intel_crtc *intel_crtc)
> reg = FDI_RX_CTL(pipe);
> temp = I915_READ(reg);
> temp &= ~((0x7 << 19) | (0x7 << 16));
> - temp |= (intel_crtc->fdi_lanes - 1) << 19;
> + temp |= (intel_crtc->config.fdi_lanes - 1) << 19;
> temp |= (I915_READ(PIPECONF(pipe)) & PIPECONF_BPC_MASK) << 11;
> I915_WRITE(reg, temp | FDI_RX_PLL_ENABLE);
>
> @@ -5379,12 +5379,12 @@ static bool ironlake_check_fdi_lanes(struct intel_crtc *intel_crtc)
> to_intel_crtc(dev_priv->pipe_to_crtc_mapping[PIPE_B]);
>
> DRM_DEBUG_KMS("checking fdi config on pipe %c, lanes %i\n",
> - pipe_name(intel_crtc->pipe), intel_crtc->fdi_lanes);
> - if (intel_crtc->fdi_lanes > 4) {
> + pipe_name(intel_crtc->pipe), intel_crtc->config.fdi_lanes);
> + if (intel_crtc->config.fdi_lanes > 4) {
> DRM_DEBUG_KMS("invalid fdi lane config on pipe %c: %i lanes\n",
> - pipe_name(intel_crtc->pipe), intel_crtc->fdi_lanes);
> + pipe_name(intel_crtc->pipe), intel_crtc->config.fdi_lanes);
> /* Clamp lanes to avoid programming the hw with bogus values. */
> - intel_crtc->fdi_lanes = 4;
> + intel_crtc->config.fdi_lanes = 4;
>
> return false;
> }
> @@ -5397,28 +5397,28 @@ static bool ironlake_check_fdi_lanes(struct intel_crtc *intel_crtc)
> return true;
> case PIPE_B:
> if (dev_priv->pipe_to_crtc_mapping[PIPE_C]->enabled &&
> - intel_crtc->fdi_lanes > 2) {
> + intel_crtc->config.fdi_lanes > 2) {
> DRM_DEBUG_KMS("invalid shared fdi lane config on pipe %c: %i lanes\n",
> - pipe_name(intel_crtc->pipe), intel_crtc->fdi_lanes);
> + pipe_name(intel_crtc->pipe), intel_crtc->config.fdi_lanes);
> /* Clamp lanes to avoid programming the hw with bogus values. */
> - intel_crtc->fdi_lanes = 2;
> + intel_crtc->config.fdi_lanes = 2;
>
> return false;
> }
>
> - if (intel_crtc->fdi_lanes > 2)
> + if (intel_crtc->config.fdi_lanes > 2)
> WARN_ON(I915_READ(SOUTH_CHICKEN1) & FDI_BC_BIFURCATION_SELECT);
> else
> cpt_enable_fdi_bc_bifurcation(dev);
>
> return true;
> case PIPE_C:
> - if (!pipe_B_crtc->base.enabled || pipe_B_crtc->fdi_lanes <= 2) {
> - if (intel_crtc->fdi_lanes > 2) {
> + if (!pipe_B_crtc->base.enabled || pipe_B_crtc->config.fdi_lanes <= 2) {
> + if (intel_crtc->config.fdi_lanes > 2) {
> DRM_DEBUG_KMS("invalid shared fdi lane config on pipe %c: %i lanes\n",
> - pipe_name(intel_crtc->pipe), intel_crtc->fdi_lanes);
> + pipe_name(intel_crtc->pipe), intel_crtc->config.fdi_lanes);
> /* Clamp lanes to avoid programming the hw with bogus values. */
> - intel_crtc->fdi_lanes = 2;
> + intel_crtc->config.fdi_lanes = 2;
>
> return false;
> }
> @@ -5506,7 +5506,7 @@ static void ironlake_fdi_set_m_n(struct drm_crtc *crtc)
> lane = ironlake_get_lanes_required(target_clock, link_bw,
> intel_crtc->config.pipe_bpp);
>
> - intel_crtc->fdi_lanes = lane;
> + intel_crtc->config.fdi_lanes = lane;
>
> if (intel_crtc->config.pixel_multiplier > 1)
> link_bw *= intel_crtc->config.pixel_multiplier;
> @@ -5734,7 +5734,7 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
>
> /* Note, this also computes intel_crtc->fdi_lanes which is used below in
> * ironlake_check_fdi_lanes. */
> - intel_crtc->fdi_lanes = 0;
> + intel_crtc->config.fdi_lanes = 0;
> if (intel_crtc->config.has_pch_encoder)
> ironlake_fdi_set_m_n(crtc);
>
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index e3ca7e7..179b42b 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -229,6 +229,9 @@ struct intel_crtc_config {
> int pixel_target_clock;
> /* Used by SDVO (and if we ever fix it, HDMI). */
> unsigned pixel_multiplier;
> +
> + /* FDI lanes used, only valid if has_pch_encoder is set. */
> + int fdi_lanes;
> };
>
> struct intel_crtc {
> @@ -247,7 +250,6 @@ struct intel_crtc {
> bool lowfreq_avail;
> struct intel_overlay *overlay;
> struct intel_unpin_work *unpin_work;
> - int fdi_lanes;
>
> atomic_t unpin_work_count;
>
next prev parent reply other threads:[~2013-04-29 10:17 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-19 9:24 [PATCH 00/15] high-bpp fixes and fdi auto dithering Daniel Vetter
2013-04-19 9:24 ` [PATCH 01/15] drm/i915: fixup 12bpc hdmi dotclock handling Daniel Vetter
2013-04-23 15:02 ` Ville Syrjälä
2013-04-23 15:37 ` Daniel Vetter
2013-04-19 9:24 ` [PATCH 02/15] drm/i915: Disable high-bpc on pre-1.4 EDID screens Daniel Vetter
2013-04-23 15:07 ` Ville Syrjälä
2013-04-24 10:54 ` Daniel Vetter
2013-04-19 9:24 ` [PATCH 03/15] drm/i915: force bpp for eDP panels Daniel Vetter
2013-04-19 20:31 ` [PATCH] " Daniel Vetter
2013-04-19 9:24 ` [PATCH 04/15] drm/i915: drop adjusted_mode from *_set_pipeconf functions Daniel Vetter
2013-04-23 15:12 ` Ville Syrjälä
2013-04-19 9:24 ` [PATCH 05/15] drm/i915: implement high-bpc + pipeconf-dither support for g4x/vlv Daniel Vetter
2013-04-19 16:39 ` Jesse Barnes
2013-04-19 18:17 ` [PATCH] " Daniel Vetter
2013-04-19 18:39 ` Jesse Barnes
2013-04-19 19:29 ` Daniel Vetter
2013-04-23 15:27 ` Ville Syrjälä
2013-04-23 20:39 ` Daniel Vetter
2013-04-23 22:27 ` Daniel Vetter
2013-04-24 11:07 ` Ville Syrjälä
2013-04-23 22:30 ` Daniel Vetter
2013-04-24 11:11 ` Ville Syrjälä
2013-04-24 12:57 ` Daniel Vetter
2013-04-24 13:07 ` Ville Syrjälä
2013-04-19 9:24 ` [PATCH 06/15] drm/i915: allow high-bpc modes on DP Daniel Vetter
2013-04-29 10:16 ` Imre Deak
2013-04-19 9:24 ` [PATCH 07/15] drm/i915: Fixup non-24bpp support for VGA screens on Haswell Daniel Vetter
2013-04-24 11:12 ` Ville Syrjälä
2013-04-24 12:50 ` Daniel Vetter
2013-04-19 9:24 ` [PATCH 08/15] drm/i915: move intel_crtc->fdi_lanes to pipe_config Daniel Vetter
2013-04-29 10:17 ` Imre Deak [this message]
2013-04-19 9:24 ` [PATCH 09/15] drm/i915: hw state readout support for pipe_config->fdi_lanes Daniel Vetter
2013-04-24 11:23 ` Ville Syrjälä
2013-04-24 12:49 ` Daniel Vetter
2013-04-24 13:30 ` [PATCH] " Daniel Vetter
2013-04-29 10:22 ` Imre Deak
2013-04-29 17:33 ` [PATCH] drm/i915: put the right cpu_transcoder into pipe_config for hw state readout Daniel Vetter
2013-04-29 17:33 ` [PATCH] drm/i915: hw state readout support for pipe_config->fdi_lanes Daniel Vetter
2013-04-19 9:24 ` [PATCH 10/15] drm/i915: split up fdi_set_m_n into computation and hw setup Daniel Vetter
2013-04-24 11:26 ` Ville Syrjälä
2013-04-19 9:24 ` [PATCH 11/15] drm/i915: compute fdi lane config earlier Daniel Vetter
2013-04-29 12:13 ` Imre Deak
2013-04-19 9:24 ` [PATCH 12/15] drm/i915: Split up ironlake_check_fdi_lanes Daniel Vetter
2013-04-29 12:19 ` Imre Deak
2013-04-19 9:24 ` [PATCH 13/15] drm/i915: move fdi lane configuration checks ahead Daniel Vetter
2013-04-22 10:32 ` Ville Syrjälä
2013-04-22 15:13 ` [PATCH] " Daniel Vetter
2013-04-29 12:31 ` Imre Deak
2013-04-29 17:34 ` Daniel Vetter
2013-04-19 9:24 ` [PATCH 14/15] drm/i915: don't count cpu ports for fdi B/C lane sharing Daniel Vetter
2013-04-29 13:00 ` Imre Deak
2013-04-19 9:24 ` [PATCH 15/15] drm/i915: implement fdi auto-dithering Daniel Vetter
2013-04-29 14:02 ` Imre Deak
2013-04-29 14:43 ` Daniel Vetter
2013-04-29 14:59 ` Imre Deak
2013-04-29 19:35 ` Daniel Vetter
2013-04-19 15:05 ` [PATCH 00/15] high-bpp fixes and fdi auto dithering Chris Wilson
2013-04-25 10:28 ` Jani Nikula
2013-04-29 19:51 ` Daniel Vetter
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=1367230658.6390.45.camel@intelbox \
--to=imre.deak@intel.com \
--cc=daniel.vetter@ffwll.ch \
--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 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.