From: Jani Nikula <jani.nikula@linux.intel.com>
To: Ville Syrjala <ville.syrjala@linux.intel.com>,
intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH 01/14] drm/i915: Extract intel_{get, set}_m_n()
Date: Thu, 27 Jan 2022 13:11:51 +0200 [thread overview]
Message-ID: <87zgnhwhzc.fsf@intel.com> (raw)
In-Reply-To: <20220127093303.17309-2-ville.syrjala@linux.intel.com>
On Thu, 27 Jan 2022, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Make the M/N setup/readout a bit less repitive by extracting
> a few small helpers.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Nice!
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 109 ++++++++-----------
> 1 file changed, 47 insertions(+), 62 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 91add3d85151..f76faa195cb9 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -3113,6 +3113,17 @@ static void intel_panel_sanitize_ssc(struct drm_i915_private *dev_priv)
> }
> }
>
> +static void intel_set_m_n(struct drm_i915_private *i915,
> + const struct intel_link_m_n *m_n,
> + i915_reg_t data_m_reg, i915_reg_t data_n_reg,
> + i915_reg_t link_m_reg, i915_reg_t link_n_reg)
> +{
> + intel_de_write(i915, data_m_reg, TU_SIZE(m_n->tu) | m_n->gmch_m);
> + intel_de_write(i915, data_n_reg, m_n->gmch_n);
> + intel_de_write(i915, link_m_reg, m_n->link_m);
> + intel_de_write(i915, link_n_reg, m_n->link_n);
> +}
> +
> static void intel_pch_transcoder_set_m_n(const struct intel_crtc_state *crtc_state,
> const struct intel_link_m_n *m_n)
> {
> @@ -3120,11 +3131,9 @@ static void intel_pch_transcoder_set_m_n(const struct intel_crtc_state *crtc_sta
> struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> enum pipe pipe = crtc->pipe;
>
> - intel_de_write(dev_priv, PCH_TRANS_DATA_M1(pipe),
> - TU_SIZE(m_n->tu) | m_n->gmch_m);
> - intel_de_write(dev_priv, PCH_TRANS_DATA_N1(pipe), m_n->gmch_n);
> - intel_de_write(dev_priv, PCH_TRANS_LINK_M1(pipe), m_n->link_m);
> - intel_de_write(dev_priv, PCH_TRANS_LINK_N1(pipe), m_n->link_n);
> + intel_set_m_n(dev_priv, m_n,
> + PCH_TRANS_DATA_M1(pipe), PCH_TRANS_DATA_N1(pipe),
> + PCH_TRANS_LINK_M1(pipe), PCH_TRANS_LINK_N1(pipe));
> }
>
> static bool transcoder_has_m2_n2(struct drm_i915_private *dev_priv,
> @@ -3150,35 +3159,23 @@ static void intel_cpu_transcoder_set_m_n(const struct intel_crtc_state *crtc_sta
> enum transcoder transcoder = crtc_state->cpu_transcoder;
>
> if (DISPLAY_VER(dev_priv) >= 5) {
> - intel_de_write(dev_priv, PIPE_DATA_M1(transcoder),
> - TU_SIZE(m_n->tu) | m_n->gmch_m);
> - intel_de_write(dev_priv, PIPE_DATA_N1(transcoder),
> - m_n->gmch_n);
> - intel_de_write(dev_priv, PIPE_LINK_M1(transcoder),
> - m_n->link_m);
> - intel_de_write(dev_priv, PIPE_LINK_N1(transcoder),
> - m_n->link_n);
> + intel_set_m_n(dev_priv, m_n,
> + PIPE_DATA_M1(transcoder), PIPE_DATA_N1(transcoder),
> + PIPE_LINK_M1(transcoder), PIPE_LINK_N1(transcoder));
> /*
> * M2_N2 registers are set only if DRRS is supported
> * (to make sure the registers are not unnecessarily accessed).
> */
> if (m2_n2 && crtc_state->has_drrs &&
> transcoder_has_m2_n2(dev_priv, transcoder)) {
> - intel_de_write(dev_priv, PIPE_DATA_M2(transcoder),
> - TU_SIZE(m2_n2->tu) | m2_n2->gmch_m);
> - intel_de_write(dev_priv, PIPE_DATA_N2(transcoder),
> - m2_n2->gmch_n);
> - intel_de_write(dev_priv, PIPE_LINK_M2(transcoder),
> - m2_n2->link_m);
> - intel_de_write(dev_priv, PIPE_LINK_N2(transcoder),
> - m2_n2->link_n);
> + intel_set_m_n(dev_priv, m2_n2,
> + PIPE_DATA_M2(transcoder), PIPE_DATA_N2(transcoder),
> + PIPE_LINK_M2(transcoder), PIPE_LINK_N2(transcoder));
> }
> } else {
> - intel_de_write(dev_priv, PIPE_DATA_M_G4X(pipe),
> - TU_SIZE(m_n->tu) | m_n->gmch_m);
> - intel_de_write(dev_priv, PIPE_DATA_N_G4X(pipe), m_n->gmch_n);
> - intel_de_write(dev_priv, PIPE_LINK_M_G4X(pipe), m_n->link_m);
> - intel_de_write(dev_priv, PIPE_LINK_N_G4X(pipe), m_n->link_n);
> + intel_set_m_n(dev_priv, m_n,
> + PIPE_DATA_M_G4X(pipe), PIPE_DATA_N_G4X(pipe),
> + PIPE_LINK_M_G4X(pipe), PIPE_LINK_N_G4X(pipe));
> }
> }
>
> @@ -3863,6 +3860,18 @@ int ilk_get_lanes_required(int target_clock, int link_bw, int bpp)
> return DIV_ROUND_UP(bps, link_bw * 8);
> }
>
> +static void intel_get_m_n(struct drm_i915_private *i915,
> + struct intel_link_m_n *m_n,
> + i915_reg_t data_m_reg, i915_reg_t data_n_reg,
> + i915_reg_t link_m_reg, i915_reg_t link_n_reg)
> +{
> + m_n->link_m = intel_de_read(i915, link_m_reg);
> + m_n->link_n = intel_de_read(i915, link_n_reg);
> + m_n->gmch_m = intel_de_read(i915, data_m_reg) & ~TU_SIZE_MASK;
> + m_n->gmch_n = intel_de_read(i915, data_n_reg);
> + m_n->tu = ((intel_de_read(i915, data_m_reg) & TU_SIZE_MASK) >> TU_SIZE_SHIFT) + 1;
> +}
> +
> static void intel_pch_transcoder_get_m_n(struct intel_crtc *crtc,
> struct intel_link_m_n *m_n)
> {
> @@ -3870,13 +3879,9 @@ static void intel_pch_transcoder_get_m_n(struct intel_crtc *crtc,
> struct drm_i915_private *dev_priv = to_i915(dev);
> enum pipe pipe = crtc->pipe;
>
> - m_n->link_m = intel_de_read(dev_priv, PCH_TRANS_LINK_M1(pipe));
> - m_n->link_n = intel_de_read(dev_priv, PCH_TRANS_LINK_N1(pipe));
> - m_n->gmch_m = intel_de_read(dev_priv, PCH_TRANS_DATA_M1(pipe))
> - & ~TU_SIZE_MASK;
> - m_n->gmch_n = intel_de_read(dev_priv, PCH_TRANS_DATA_N1(pipe));
> - m_n->tu = ((intel_de_read(dev_priv, PCH_TRANS_DATA_M1(pipe))
> - & TU_SIZE_MASK) >> TU_SIZE_SHIFT) + 1;
> + intel_get_m_n(dev_priv, m_n,
> + PCH_TRANS_DATA_M1(pipe), PCH_TRANS_DATA_N1(pipe),
> + PCH_TRANS_LINK_M1(pipe), PCH_TRANS_LINK_N1(pipe));
> }
>
> static void intel_cpu_transcoder_get_m_n(struct intel_crtc *crtc,
> @@ -3888,39 +3893,19 @@ static void intel_cpu_transcoder_get_m_n(struct intel_crtc *crtc,
> enum pipe pipe = crtc->pipe;
>
> if (DISPLAY_VER(dev_priv) >= 5) {
> - m_n->link_m = intel_de_read(dev_priv,
> - PIPE_LINK_M1(transcoder));
> - m_n->link_n = intel_de_read(dev_priv,
> - PIPE_LINK_N1(transcoder));
> - m_n->gmch_m = intel_de_read(dev_priv,
> - PIPE_DATA_M1(transcoder))
> - & ~TU_SIZE_MASK;
> - m_n->gmch_n = intel_de_read(dev_priv,
> - PIPE_DATA_N1(transcoder));
> - m_n->tu = ((intel_de_read(dev_priv, PIPE_DATA_M1(transcoder))
> - & TU_SIZE_MASK) >> TU_SIZE_SHIFT) + 1;
> + intel_get_m_n(dev_priv, m_n,
> + PIPE_DATA_M1(transcoder), PIPE_DATA_N1(transcoder),
> + PIPE_LINK_M1(transcoder), PIPE_LINK_N1(transcoder));
>
> if (m2_n2 && transcoder_has_m2_n2(dev_priv, transcoder)) {
> - m2_n2->link_m = intel_de_read(dev_priv,
> - PIPE_LINK_M2(transcoder));
> - m2_n2->link_n = intel_de_read(dev_priv,
> - PIPE_LINK_N2(transcoder));
> - m2_n2->gmch_m = intel_de_read(dev_priv,
> - PIPE_DATA_M2(transcoder))
> - & ~TU_SIZE_MASK;
> - m2_n2->gmch_n = intel_de_read(dev_priv,
> - PIPE_DATA_N2(transcoder));
> - m2_n2->tu = ((intel_de_read(dev_priv, PIPE_DATA_M2(transcoder))
> - & TU_SIZE_MASK) >> TU_SIZE_SHIFT) + 1;
> + intel_get_m_n(dev_priv, m2_n2,
> + PIPE_DATA_M2(transcoder), PIPE_DATA_N2(transcoder),
> + PIPE_LINK_M2(transcoder), PIPE_LINK_N2(transcoder));
> }
> } else {
> - m_n->link_m = intel_de_read(dev_priv, PIPE_LINK_M_G4X(pipe));
> - m_n->link_n = intel_de_read(dev_priv, PIPE_LINK_N_G4X(pipe));
> - m_n->gmch_m = intel_de_read(dev_priv, PIPE_DATA_M_G4X(pipe))
> - & ~TU_SIZE_MASK;
> - m_n->gmch_n = intel_de_read(dev_priv, PIPE_DATA_N_G4X(pipe));
> - m_n->tu = ((intel_de_read(dev_priv, PIPE_DATA_M_G4X(pipe))
> - & TU_SIZE_MASK) >> TU_SIZE_SHIFT) + 1;
> + intel_get_m_n(dev_priv, m_n,
> + PIPE_DATA_M_G4X(pipe), PIPE_DATA_N_G4X(pipe),
> + PIPE_LINK_M_G4X(pipe), PIPE_LINK_N_G4X(pipe));
> }
> }
--
Jani Nikula, Intel Open Source Graphics Center
next prev parent reply other threads:[~2022-01-27 11:11 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-27 9:32 [Intel-gfx] [PATCH 00/14] drm/i915: M/N cleanup Ville Syrjala
2022-01-27 9:32 ` [Intel-gfx] [PATCH 01/14] drm/i915: Extract intel_{get,set}_m_n() Ville Syrjala
2022-01-27 11:11 ` Jani Nikula [this message]
2022-01-27 9:32 ` [Intel-gfx] [PATCH 02/14] drm/i915: Clean up M/N register defines Ville Syrjala
2022-01-27 11:17 ` Jani Nikula
2022-01-27 11:32 ` Ville Syrjälä
2022-01-27 11:41 ` Jani Nikula
2022-01-27 12:02 ` [Intel-gfx] [PATCH v2 " Ville Syrjala
2022-01-27 17:36 ` [Intel-gfx] [PATCH " kernel test robot
2022-01-27 17:36 ` kernel test robot
2022-01-27 9:32 ` [Intel-gfx] [PATCH 03/14] drm/i915: s/gmch_{m,n}/data_{m,n}/ Ville Syrjala
2022-01-27 11:18 ` Jani Nikula
2022-01-27 9:32 ` [Intel-gfx] [PATCH 04/14] drm/i915: Move drrs hardware bit frobbing to small helpers Ville Syrjala
2022-01-27 11:23 ` Jani Nikula
2022-01-27 11:24 ` Jani Nikula
2022-01-27 11:35 ` Ville Syrjälä
2022-01-27 11:42 ` Jani Nikula
2022-01-27 9:32 ` [Intel-gfx] [PATCH 05/14] drm/i915: Make M/N set/get a bit more direct Ville Syrjala
2022-01-27 9:32 ` [Intel-gfx] [PATCH 06/14] drm/i915: Move PCH transcoder M/N setup into the PCH code Ville Syrjala
2022-01-27 9:32 ` [Intel-gfx] [PATCH 07/14] drm/i915: Move M/N setup to a more logical place on ddi platforms Ville Syrjala
2022-01-27 9:32 ` [Intel-gfx] [PATCH 08/14] drm/i915: Extract {i9xx, ilk}_configure_cpu_transcoder() Ville Syrjala
2022-01-27 9:32 ` [Intel-gfx] [PATCH 09/14] drm/i915: Add fdi_m2_n2 Ville Syrjala
2022-01-27 9:32 ` [Intel-gfx] [PATCH 10/14] drm/i915: Program FDI RX TUSIZE2 Ville Syrjala
2022-01-27 9:33 ` [Intel-gfx] [PATCH 11/14] drm/i915: Dump dp_m2_n2 always Ville Syrjala
2022-01-27 9:33 ` [Intel-gfx] [PATCH 12/14] drm/i915: Extract can_enable_drrs() Ville Syrjala
2022-01-27 9:33 ` [Intel-gfx] [PATCH 13/14] drm/i915: Set DP M2/N2 equal to M1/N1 when not doing DRRS Ville Syrjala
2022-01-27 9:33 ` [Intel-gfx] [PATCH 14/14] drm/i915: Always check dp_m2_n2 on pre-bdw Ville Syrjala
2022-01-27 11:01 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: M/N cleanup Patchwork
2022-01-27 14:43 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: M/N cleanup (rev2) Patchwork
2022-01-27 15:13 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-01-27 19:55 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
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=87zgnhwhzc.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=ville.syrjala@linux.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.