From: Daniel Vetter <daniel@ffwll.ch>
To: ville.syrjala@linux.intel.com
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 06/15] drm/i915: Pass around dev_priv for ddi buffer programming
Date: Thu, 10 Dec 2015 14:25:42 +0100 [thread overview]
Message-ID: <20151210132542.GD20822@phenom.ffwll.local> (raw)
In-Reply-To: <1449597590-6971-7-git-send-email-ville.syrjala@linux.intel.com>
On Tue, Dec 08, 2015 at 07:59:41PM +0200, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Make the ddi buffer programming code a bit more neat by passing
> around dev_priv instead of dev.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Too lazy to check you didn't upset the compiler here. Assuming gcc is
still happy:
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/i915/intel_ddi.c | 79 +++++++++++++++++++---------------------
> 1 file changed, 37 insertions(+), 42 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index e281813cad82..5d0b03d6d388 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -301,8 +301,8 @@ static const struct bxt_ddi_buf_trans bxt_ddi_translations_hdmi[] = {
> { 154, 0x9A, 1, 128, true }, /* 9: 1200 0 */
> };
>
> -static void bxt_ddi_vswing_sequence(struct drm_device *dev, u32 level,
> - enum port port, int type);
> +static void bxt_ddi_vswing_sequence(struct drm_i915_private *dev_priv,
> + u32 level, enum port port, int type);
>
> static void ddi_get_encoder_port(struct intel_encoder *intel_encoder,
> struct intel_digital_port **dig_port,
> @@ -349,12 +349,12 @@ intel_dig_port_supports_hdmi(const struct intel_digital_port *intel_dig_port)
> }
>
> static const struct ddi_buf_trans *
> -skl_get_buf_trans_dp(struct drm_device *dev, int *n_entries)
> +skl_get_buf_trans_dp(struct drm_i915_private *dev_priv, int *n_entries)
> {
> - if (IS_SKL_ULX(dev)) {
> + if (IS_SKL_ULX(dev_priv)) {
> *n_entries = ARRAY_SIZE(skl_y_ddi_translations_dp);
> return skl_y_ddi_translations_dp;
> - } else if (IS_SKL_ULT(dev)) {
> + } else if (IS_SKL_ULT(dev_priv)) {
> *n_entries = ARRAY_SIZE(skl_u_ddi_translations_dp);
> return skl_u_ddi_translations_dp;
> } else {
> @@ -364,15 +364,13 @@ skl_get_buf_trans_dp(struct drm_device *dev, int *n_entries)
> }
>
> static const struct ddi_buf_trans *
> -skl_get_buf_trans_edp(struct drm_device *dev, int *n_entries)
> +skl_get_buf_trans_edp(struct drm_i915_private *dev_priv, int *n_entries)
> {
> - struct drm_i915_private *dev_priv = dev->dev_private;
> -
> if (dev_priv->edp_low_vswing) {
> - if (IS_SKL_ULX(dev)) {
> + if (IS_SKL_ULX(dev_priv)) {
> *n_entries = ARRAY_SIZE(skl_y_ddi_translations_edp);
> return skl_y_ddi_translations_edp;
> - } else if (IS_SKL_ULT(dev)) {
> + } else if (IS_SKL_ULT(dev_priv)) {
> *n_entries = ARRAY_SIZE(skl_u_ddi_translations_edp);
> return skl_u_ddi_translations_edp;
> } else {
> @@ -381,13 +379,13 @@ skl_get_buf_trans_edp(struct drm_device *dev, int *n_entries)
> }
> }
>
> - return skl_get_buf_trans_dp(dev, n_entries);
> + return skl_get_buf_trans_dp(dev_priv, n_entries);
> }
>
> static const struct ddi_buf_trans *
> -skl_get_buf_trans_hdmi(struct drm_device *dev, int *n_entries)
> +skl_get_buf_trans_hdmi(struct drm_i915_private *dev_priv, int *n_entries)
> {
> - if (IS_SKL_ULX(dev)) {
> + if (IS_SKL_ULX(dev_priv)) {
> *n_entries = ARRAY_SIZE(skl_y_ddi_translations_hdmi);
> return skl_y_ddi_translations_hdmi;
> } else {
> @@ -403,10 +401,9 @@ skl_get_buf_trans_hdmi(struct drm_device *dev, int *n_entries)
> * in either FDI or DP modes only, as HDMI connections will work with both
> * of those
> */
> -static void intel_prepare_ddi_buffers(struct drm_device *dev, enum port port,
> - bool supports_hdmi)
> +static void intel_prepare_ddi_buffers(struct drm_i915_private *dev_priv,
> + enum port port, bool supports_hdmi)
> {
> - struct drm_i915_private *dev_priv = dev->dev_private;
> u32 iboost_bit = 0;
> int i, n_hdmi_entries, n_dp_entries, n_edp_entries, hdmi_default_entry,
> size;
> @@ -417,28 +414,28 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev, enum port port,
> const struct ddi_buf_trans *ddi_translations_hdmi;
> const struct ddi_buf_trans *ddi_translations;
>
> - if (IS_BROXTON(dev)) {
> + if (IS_BROXTON(dev_priv)) {
> if (!supports_hdmi)
> return;
>
> /* Vswing programming for HDMI */
> - bxt_ddi_vswing_sequence(dev, hdmi_level, port,
> + bxt_ddi_vswing_sequence(dev_priv, hdmi_level, port,
> INTEL_OUTPUT_HDMI);
> return;
> - } else if (IS_SKYLAKE(dev) || IS_KABYLAKE(dev)) {
> + } else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) {
> ddi_translations_fdi = NULL;
> ddi_translations_dp =
> - skl_get_buf_trans_dp(dev, &n_dp_entries);
> + skl_get_buf_trans_dp(dev_priv, &n_dp_entries);
> ddi_translations_edp =
> - skl_get_buf_trans_edp(dev, &n_edp_entries);
> + skl_get_buf_trans_edp(dev_priv, &n_edp_entries);
> ddi_translations_hdmi =
> - skl_get_buf_trans_hdmi(dev, &n_hdmi_entries);
> + skl_get_buf_trans_hdmi(dev_priv, &n_hdmi_entries);
> hdmi_default_entry = 8;
> /* If we're boosting the current, set bit 31 of trans1 */
> if (dev_priv->vbt.ddi_port_info[port].hdmi_boost_level ||
> dev_priv->vbt.ddi_port_info[port].dp_boost_level)
> iboost_bit = 1<<31;
> - } else if (IS_BROADWELL(dev)) {
> + } else if (IS_BROADWELL(dev_priv)) {
> ddi_translations_fdi = bdw_ddi_translations_fdi;
> ddi_translations_dp = bdw_ddi_translations_dp;
> ddi_translations_edp = bdw_ddi_translations_edp;
> @@ -447,7 +444,7 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev, enum port port,
> n_dp_entries = ARRAY_SIZE(bdw_ddi_translations_dp);
> n_hdmi_entries = ARRAY_SIZE(bdw_ddi_translations_hdmi);
> hdmi_default_entry = 7;
> - } else if (IS_HASWELL(dev)) {
> + } else if (IS_HASWELL(dev_priv)) {
> ddi_translations_fdi = hsw_ddi_translations_fdi;
> ddi_translations_dp = hsw_ddi_translations_dp;
> ddi_translations_edp = hsw_ddi_translations_dp;
> @@ -478,7 +475,7 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev, enum port port,
> size = n_dp_entries;
> break;
> case PORT_D:
> - if (intel_dp_is_edp(dev, PORT_D)) {
> + if (intel_dp_is_edp(dev_priv->dev, PORT_D)) {
> ddi_translations = ddi_translations_edp;
> size = n_edp_entries;
> } else {
> @@ -545,7 +542,7 @@ void intel_prepare_ddi(struct drm_device *dev)
> supports_hdmi = intel_dig_port &&
> intel_dig_port_supports_hdmi(intel_dig_port);
>
> - intel_prepare_ddi_buffers(dev, port, supports_hdmi);
> + intel_prepare_ddi_buffers(to_i915(dev), port, supports_hdmi);
> visited[port] = true;
> }
> }
> @@ -2062,10 +2059,9 @@ void intel_ddi_disable_pipe_clock(struct intel_crtc *intel_crtc)
> TRANS_CLK_SEL_DISABLED);
> }
>
> -static void skl_ddi_set_iboost(struct drm_device *dev, u32 level,
> - enum port port, int type)
> +static void skl_ddi_set_iboost(struct drm_i915_private *dev_priv,
> + u32 level, enum port port, int type)
> {
> - struct drm_i915_private *dev_priv = dev->dev_private;
> const struct ddi_buf_trans *ddi_translations;
> uint8_t iboost;
> uint8_t dp_iboost, hdmi_iboost;
> @@ -2080,21 +2076,21 @@ static void skl_ddi_set_iboost(struct drm_device *dev, u32 level,
> if (dp_iboost) {
> iboost = dp_iboost;
> } else {
> - ddi_translations = skl_get_buf_trans_dp(dev, &n_entries);
> + ddi_translations = skl_get_buf_trans_dp(dev_priv, &n_entries);
> iboost = ddi_translations[level].i_boost;
> }
> } else if (type == INTEL_OUTPUT_EDP) {
> if (dp_iboost) {
> iboost = dp_iboost;
> } else {
> - ddi_translations = skl_get_buf_trans_edp(dev, &n_entries);
> + ddi_translations = skl_get_buf_trans_edp(dev_priv, &n_entries);
> iboost = ddi_translations[level].i_boost;
> }
> } else if (type == INTEL_OUTPUT_HDMI) {
> if (hdmi_iboost) {
> iboost = hdmi_iboost;
> } else {
> - ddi_translations = skl_get_buf_trans_hdmi(dev, &n_entries);
> + ddi_translations = skl_get_buf_trans_hdmi(dev_priv, &n_entries);
> iboost = ddi_translations[level].i_boost;
> }
> } else {
> @@ -2119,10 +2115,9 @@ static void skl_ddi_set_iboost(struct drm_device *dev, u32 level,
> I915_WRITE(DISPIO_CR_TX_BMU_CR0, reg);
> }
>
> -static void bxt_ddi_vswing_sequence(struct drm_device *dev, u32 level,
> - enum port port, int type)
> +static void bxt_ddi_vswing_sequence(struct drm_i915_private *dev_priv,
> + u32 level, enum port port, int type)
> {
> - struct drm_i915_private *dev_priv = dev->dev_private;
> const struct bxt_ddi_buf_trans *ddi_translations;
> u32 n_entries, i;
> uint32_t val;
> @@ -2237,7 +2232,7 @@ static uint32_t translate_signal_level(int signal_levels)
> uint32_t ddi_signal_levels(struct intel_dp *intel_dp)
> {
> struct intel_digital_port *dport = dp_to_dig_port(intel_dp);
> - struct drm_device *dev = dport->base.base.dev;
> + struct drm_i915_private *dev_priv = to_i915(dport->base.base.dev);
> struct intel_encoder *encoder = &dport->base;
> uint8_t train_set = intel_dp->train_set[0];
> int signal_levels = train_set & (DP_TRAIN_VOLTAGE_SWING_MASK |
> @@ -2247,10 +2242,10 @@ uint32_t ddi_signal_levels(struct intel_dp *intel_dp)
>
> level = translate_signal_level(signal_levels);
>
> - if (IS_SKYLAKE(dev) || IS_KABYLAKE(dev))
> - skl_ddi_set_iboost(dev, level, port, encoder->type);
> - else if (IS_BROXTON(dev))
> - bxt_ddi_vswing_sequence(dev, level, port, encoder->type);
> + if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
> + skl_ddi_set_iboost(dev_priv, level, port, encoder->type);
> + else if (IS_BROXTON(dev_priv))
> + bxt_ddi_vswing_sequence(dev_priv, level, port, encoder->type);
>
> return DDI_BUF_TRANS_SELECT(level);
> }
> @@ -2333,8 +2328,8 @@ static void intel_ddi_pre_enable(struct intel_encoder *intel_encoder)
> if (IS_BROXTON(dev)) {
> hdmi_level = dev_priv->vbt.
> ddi_port_info[port].hdmi_level_shift;
> - bxt_ddi_vswing_sequence(dev, hdmi_level, port,
> - INTEL_OUTPUT_HDMI);
> + bxt_ddi_vswing_sequence(dev_priv, hdmi_level, port,
> + INTEL_OUTPUT_HDMI);
> }
> intel_hdmi->set_infoframes(encoder,
> crtc->config->has_hdmi_sink,
> --
> 2.4.10
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-12-10 13:25 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-08 17:59 [PATCH 00/15] drm/i915: Cure DDI from multiple personality disorder ville.syrjala
2015-12-08 17:59 ` [PATCH 01/15] drm/i915: Pass the correct encoder to intel_ddi_clk_select() with MST ville.syrjala
2015-12-10 13:17 ` Daniel Vetter
2015-12-08 17:59 ` [PATCH 02/15] drm/i915: Check max number of lanes when registering DDI ports ville.syrjala
2015-12-10 13:19 ` Daniel Vetter
2015-12-08 17:59 ` [PATCH 03/15] drm/i915: Store max lane count in intel_digital_port ville.syrjala
2015-12-10 13:22 ` Daniel Vetter
2015-12-10 13:31 ` Ville Syrjälä
2015-12-10 14:08 ` Daniel Vetter
2015-12-08 17:59 ` [PATCH 04/15] drm/i915: Remove pointless 'ddi_translations' local variable ville.syrjala
2015-12-10 13:22 ` Daniel Vetter
2015-12-08 17:59 ` [PATCH 05/15] drm/i915: Eliminate duplicated skl_get_buf_trans_dp() ville.syrjala
2015-12-10 13:24 ` Daniel Vetter
2015-12-08 17:59 ` [PATCH 06/15] drm/i915: Pass around dev_priv for ddi buffer programming ville.syrjala
2015-12-10 13:25 ` Daniel Vetter [this message]
2015-12-08 17:59 ` [PATCH 07/15] drm/i915: Add BUILD_BUG_ON()s for DDI translation table sizes ville.syrjala
2015-12-10 13:28 ` Daniel Vetter
2015-12-10 14:43 ` Ville Syrjälä
2015-12-08 17:59 ` [PATCH 08/15] drm/i915: Reject >9 ddi translation entried if port != A/E on SKL ville.syrjala
2015-12-10 13:30 ` Daniel Vetter
2015-12-10 13:42 ` Ville Syrjälä
2015-12-10 14:09 ` Daniel Vetter
2015-12-08 17:59 ` [PATCH 09/15] drm/i915: Kill intel_prepare_ddi() ville.syrjala
2015-12-10 13:37 ` Daniel Vetter
2015-12-10 14:00 ` Ville Syrjälä
2015-12-08 17:59 ` [PATCH 10/15] drm/i915: Split the problematic dual-role DDI encoder into two encoders ville.syrjala
2015-12-08 18:21 ` kbuild test robot
2015-12-10 13:47 ` Daniel Vetter
2015-12-10 14:10 ` Ville Syrjälä
2015-12-10 14:20 ` Daniel Vetter
2015-12-08 17:59 ` [PATCH 11/15] drm/i915: Explicitly use ddi bug trans entry 9 for hdmi ville.syrjala
2015-12-10 13:48 ` Daniel Vetter
2015-12-10 14:41 ` Ville Syrjälä
2015-12-11 17:22 ` Daniel Vetter
2015-12-08 17:59 ` [PATCH 12/15] drm/i915: Split DP/eDP/FDI and HDMI/DVI DDI buffer programming apart ville.syrjala
2015-12-10 13:52 ` Daniel Vetter
2015-12-10 14:15 ` Ville Syrjälä
2015-12-08 17:59 ` [PATCH 13/15] drm/i915: Add a sanity check for 'hdmi_default_entry' ville.syrjala
2015-12-10 13:54 ` Daniel Vetter
2015-12-08 17:59 ` [PATCH 14/15] drm/i915: Get the iboost setting based on the port type ville.syrjala
2015-12-10 13:55 ` Daniel Vetter
2015-12-10 14:17 ` Ville Syrjälä
2015-12-08 17:59 ` [PATCH 15/15] drm/i915: Simplify intel_ddi_get_encoder_port() ville.syrjala
2015-12-10 13:57 ` Daniel Vetter
2015-12-10 14:19 ` Ville Syrjälä
2016-01-12 14:52 ` [PATCH 00/15] drm/i915: Cure DDI from multiple personality disorder 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=20151210132542.GD20822@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--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.