drm/i915: Introduce intel_ddi_dp_level.
Subsystems (2)
Rodrigo Vivi
maintainerPATCH 1/4 drm/i915: Introduce intel_ddi_dp_level.
No functional changes. This only moves the DP level selection to a separated function that will be later used to organize better the vswing sequences.
--- drivers/gpu/drm/i915/intel_ddi.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +10 -6
@@ -2054,18 +2054,22 @@ static uint32_t translate_signal_level(int signal_levels)return 0 ; } +static uint32_t intel_ddi_dp_level (struct intel_dp *intel_dp) +{ +uint8_t train_set = intel_dp->train_set[0 ]; +int signal_levels = train_set & (DP_TRAIN_VOLTAGE_SWING_MASK | +DP_TRAIN_PRE_EMPHASIS_MASK ); + +return translate_signal_level (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_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 | -DP_TRAIN_PRE_EMPHASIS_MASK );enum port port = dport->port; -uint32_t level; - - level =translate_signal_level (signal_levels); +uint32_t level =intel_ddi_dp_level (intel_dp);if (IS_GEN9_BC (dev_priv))skl_ddi_set_iboost (encoder, level);
Signature · 6 lines
2.13.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 2/4 drm/i915: decouple gen9 and gen10 dp signal levels.
Let's decouple bxt, glk and cnl dp signal levels from other DDIs to avoid confusion.
No functional change. Only a reorg to avoid messing with currently working DP signal levels when moving voltage swing sequences around to match spec.
--- drivers/gpu/drm/i915/intel_ddi.c | 26 ++++++++++++++++---------- drivers/gpu/drm/i915/intel_dp.c | 10 ++++------ drivers/gpu/drm/i915/intel_drv.h | 1 + 3 files changed, 21 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +16 -10
@@ -2063,23 +2063,29 @@ static uint32_t intel_ddi_dp_level(struct intel_dp *intel_dp)return translate_signal_level (signal_levels); } -uint32_t ddi_signal_levels (struct intel_dp *intel_dp) +u32 bxt_signal_levels (struct intel_dp *intel_dp) {struct intel_digital_port *dport =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (dport->base.base.dev);struct intel_encoder *encoder = &dport->base;enum port port = dport->port; -uint32_t level =intel_ddi_dp_level (intel_dp); +u32 level =intel_ddi_dp_level (intel_dp); -if (IS_GEN9_BC (dev_priv)) -skl_ddi_set_iboost (encoder, level); -else if (IS_GEN9_LP (dev_priv)) -bxt_ddi_vswing_sequence (dev_priv, level, port, encoder->type); -else if (IS_CANNONLAKE (dev_priv)) { +if (IS_CANNONLAKE (dev_priv))cnl_ddi_vswing_sequence (encoder, level); -/* DDI_BUF_CTL bits 27:24 are reserved on CNL */ -return 0 ; - } +else +bxt_ddi_vswing_sequence (dev_priv, level, port, encoder->type); + +return 0 ; +} + +uint32_t ddi_signal_levels (struct intel_dp *intel_dp) +{ +struct intel_digital_port *dport =dp_to_dig_port (intel_dp); +struct intel_encoder *encoder = &dport->base; +uint32_t level =intel_ddi_dp_level (intel_dp); + +skl_ddi_set_iboost (encoder, level);return DDI_BUF_TRANS_SELECT (level); }
drivers/gpu/drm/i915/intel_dp.c +4 -6
@@ -3506,13 +3506,11 @@ intel_dp_set_signal_levels(struct intel_dp *intel_dp)uint32_t signal_levels, mask =0 ;uint8_t train_set = intel_dp->train_set[0 ]; -if (HAS_DDI (dev_priv)) { +if (IS_GEN9_LP (dev_priv) ||IS_CANNONLAKE (dev_priv)) { + signal_levels =bxt_signal_levels (intel_dp); + }else if (HAS_DDI (dev_priv)) { signal_levels =ddi_signal_levels (intel_dp); - -if (IS_GEN9_LP (dev_priv) ||IS_CANNONLAKE (dev_priv)) - signal_levels =0 ; -else - mask =DDI_BUF_EMP_MASK ; + mask =DDI_BUF_EMP_MASK ; }else if (IS_CHERRYVIEW (dev_priv)) { signal_levels =chv_signal_levels (intel_dp); }else if (IS_VALLEYVIEW (dev_priv)) {
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -1272,6 +1272,7 @@ void intel_ddi_clock_get(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config);void intel_ddi_set_vc_payload_alloc (const struct intel_crtc_state *crtc_state,bool state); +u32 bxt_signal_levels (struct intel_dp *intel_dp);uint32_t ddi_signal_levels (struct intel_dp *intel_dp);u8 intel_ddi_dp_voltage_max (struct intel_encoder *encoder);
Signature · 6 lines
2.13.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/4] drm/i915: decouple gen9 and gen10 dp signal levels.
Quoted 40 lines · Rodrigo Vivi
Let's decouple bxt, glk and cnl dp signal levels from other DDIs to avoid confusion.
No functional change. Only a reorg to avoid messing with currently working DP signal levels when moving voltage swing sequences around to match spec.
Cc Ville Syrjälä <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/intel_ddi.c | 26 ++++++++++++++++---------- drivers/gpu/drm/i915/intel_dp.c | 10 ++++------ drivers/gpu/drm/i915/intel_drv.h | 1 + 3 files changed, 21 insertions(+), 16 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +3
-7@@ -2063,23 +2063,29 @@ static uint32_t intel_ddi_dp_level(struct intel_dp *intel_dp)return translate_signal_level (signal_levels); } -uint32_t ddi_signal_levels (struct intel_dp *intel_dp) +u32 bxt_signal_levels (struct intel_dp *intel_dp) {struct intel_digital_port *dport =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (dport->base.base.dev);struct intel_encoder *encoder = &dport->base;enum port port = dport->port; -uint32_t level =intel_ddi_dp_level (intel_dp); +u32 level =intel_ddi_dp_level (intel_dp); -if (IS_GEN9_BC (dev_priv)) -skl_ddi_set_iboost (encoder, level); -else if (IS_GEN9_LP (dev_priv)) -bxt_ddi_vswing_sequence (dev_priv, level, port, encoder->type); -else if (IS_CANNONLAKE (dev_priv)) { +if (IS_CANNONLAKE (dev_priv))cnl_ddi_vswing_sequence (encoder, level);
drivers/gpu/drm/i915/intel_ddi.c static uint32_t intel_ddi_dp_level(struct intel_dp *intel_dp) · line 2082
Quoted 10 lines
drivers/gpu/drm/i915/intel_ddi.c +7
-3-/* DDI_BUF_CTL bits 27:24 are reserved on CNL */ -return 0 ; - } +else +bxt_ddi_vswing_sequence (dev_priv, level, port, encoder->type); + +return 0 ; +} + +uint32_t ddi_signal_levels (struct intel_dp *intel_dp)
skl_signal_levels() perhaps?
Quoted 45 lines
drivers/gpu/drm/i915/intel_ddi.c +6
-0+{ +struct intel_digital_port *dport =dp_to_dig_port (intel_dp); +struct intel_encoder *encoder = &dport->base; +uint32_t level =intel_ddi_dp_level (intel_dp); + +skl_ddi_set_iboost (encoder, level);return DDI_BUF_TRANS_SELECT (level); }drivers/gpu/drm/i915/intel_dp.c +4
-6@@ -3506,13 +3506,11 @@ intel_dp_set_signal_levels(struct intel_dp *intel_dp)uint32_t signal_levels, mask =0 ;uint8_t train_set = intel_dp->train_set[0 ]; -if (HAS_DDI (dev_priv)) { +if (IS_GEN9_LP (dev_priv) ||IS_CANNONLAKE (dev_priv)) { + signal_levels =bxt_signal_levels (intel_dp); + }else if (HAS_DDI (dev_priv)) { signal_levels =ddi_signal_levels (intel_dp); - -if (IS_GEN9_LP (dev_priv) ||IS_CANNONLAKE (dev_priv)) - signal_levels =0 ; -else - mask =DDI_BUF_EMP_MASK ; + mask =DDI_BUF_EMP_MASK ; }else if (IS_CHERRYVIEW (dev_priv)) { signal_levels =chv_signal_levels (intel_dp); }else if (IS_VALLEYVIEW (dev_priv)) {drivers/gpu/drm/i915/intel_drv.h +1
-0@@ -1272,6 +1272,7 @@ void intel_ddi_clock_get(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config);void intel_ddi_set_vc_payload_alloc (const struct intel_crtc_state *crtc_state,bool state); +u32 bxt_signal_levels (struct intel_dp *intel_dp);uint32_t ddi_signal_levels (struct intel_dp *intel_dp);u8 intel_ddi_dp_voltage_max (struct intel_encoder *encoder);Signature · 1 line
2.13.2
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/4] drm/i915: decouple gen9 and gen10 dp signal levels.
Quoted 45 lines · Ville Syrjälä
Quoted 44 lines · Rodrigo Vivi
Let's decouple bxt, glk and cnl dp signal levels from other DDIs to avoid confusion.
No functional change. Only a reorg to avoid messing with currently working DP signal levels when moving voltage swing sequences around to match spec.
Cc Ville Syrjälä <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/intel_ddi.c | 26 ++++++++++++++++---------- drivers/gpu/drm/i915/intel_dp.c | 10 ++++------ drivers/gpu/drm/i915/intel_drv.h | 1 + 3 files changed, 21 insertions(+), 16 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +4
-10@@ -2063,23 +2063,29 @@ static uint32_t intel_ddi_dp_level(struct intel_dp *intel_dp)return translate_signal_level (signal_levels); } -uint32_t ddi_signal_levels (struct intel_dp *intel_dp) +u32 bxt_signal_levels (struct intel_dp *intel_dp) {struct intel_digital_port *dport =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (dport->base.base.dev);struct intel_encoder *encoder = &dport->base;enum port port = dport->port; -uint32_t level =intel_ddi_dp_level (intel_dp); +u32 level =intel_ddi_dp_level (intel_dp); -if (IS_GEN9_BC (dev_priv)) -skl_ddi_set_iboost (encoder, level); -else if (IS_GEN9_LP (dev_priv)) -bxt_ddi_vswing_sequence (dev_priv, level, port, encoder->type); -else if (IS_CANNONLAKE (dev_priv)) { +if (IS_CANNONLAKE (dev_priv))cnl_ddi_vswing_sequence (encoder, level); -/* DDI_BUF_CTL bits 27:24 are reserved on CNL */ -return 0 ; - } +else
Quoted 8 lines
drivers/gpu/drm/i915/intel_ddi.c static uint32_t intel_ddi_dp_level(struct intel_dp *intel_dp) · line 2082
Quoted 6 lines
drivers/gpu/drm/i915/intel_ddi.c +6
-0+bxt_ddi_vswing_sequence (dev_priv, level, port, encoder->type); + +return 0 ; +} + +uint32_t ddi_signal_levels (struct intel_dp *intel_dp)
skl_signal_levels()perhaps?
Oh, it actuall gets called on all older DDI platforms. So I guess the name is OK, but the iboost call needs a platform check then,
Quoted 50 lines
Quoted 46 lines
drivers/gpu/drm/i915/intel_ddi.c +6
-0+{ +struct intel_digital_port *dport =dp_to_dig_port (intel_dp); +struct intel_encoder *encoder = &dport->base; +uint32_t level =intel_ddi_dp_level (intel_dp); + +skl_ddi_set_iboost (encoder, level);return DDI_BUF_TRANS_SELECT (level); }drivers/gpu/drm/i915/intel_dp.c +4
-6@@ -3506,13 +3506,11 @@ intel_dp_set_signal_levels(struct intel_dp *intel_dp)uint32_t signal_levels, mask =0 ;uint8_t train_set = intel_dp->train_set[0 ]; -if (HAS_DDI (dev_priv)) { +if (IS_GEN9_LP (dev_priv) ||IS_CANNONLAKE (dev_priv)) { + signal_levels =bxt_signal_levels (intel_dp); + }else if (HAS_DDI (dev_priv)) { signal_levels =ddi_signal_levels (intel_dp); - -if (IS_GEN9_LP (dev_priv) ||IS_CANNONLAKE (dev_priv)) - signal_levels =0 ; -else - mask =DDI_BUF_EMP_MASK ; + mask =DDI_BUF_EMP_MASK ; }else if (IS_CHERRYVIEW (dev_priv)) { signal_levels =chv_signal_levels (intel_dp); }else if (IS_VALLEYVIEW (dev_priv)) {drivers/gpu/drm/i915/intel_drv.h +1
-0@@ -1272,6 +1272,7 @@ void intel_ddi_clock_get(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config);void intel_ddi_set_vc_payload_alloc (const struct intel_crtc_state *crtc_state,bool state); +u32 bxt_signal_levels (struct intel_dp *intel_dp);uint32_t ddi_signal_levels (struct intel_dp *intel_dp);u8 intel_ddi_dp_voltage_max (struct intel_encoder *encoder);Signature · 1 line
2.13.2Signature · 2 lines
Ville Syrjälä Intel OTC
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 2/10 drm/i915: decouple gen9 and gen10 dp signal levels.
Let's decouple bxt, glk and cnl dp signal levels from other DDIs to avoid confusion.
No functional change. Only a reorg to avoid messing with currently working DP signal levels when moving voltage swing sequences around to match spec.
v2: ddi_signal_levels is also called from other ddi
platforms, so don't remove IS_GEN9_BC check from skl_ddi_set_iboos. (Ville).
--- drivers/gpu/drm/i915/intel_ddi.c | 27 ++++++++++++++++++--------- drivers/gpu/drm/i915/intel_dp.c | 10 ++++------ drivers/gpu/drm/i915/intel_drv.h | 1 + 3 files changed, 23 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +18 -9
@@ -2063,23 +2063,32 @@ static uint32_t intel_ddi_dp_level(struct intel_dp *intel_dp)return translate_signal_level (signal_levels); } -uint32_t ddi_signal_levels (struct intel_dp *intel_dp) +u32 bxt_signal_levels (struct intel_dp *intel_dp) {struct intel_digital_port *dport =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (dport->base.base.dev);struct intel_encoder *encoder = &dport->base;enum port port = dport->port; +u32 level =intel_ddi_dp_level (intel_dp); + +if (IS_CANNONLAKE (dev_priv)) +cnl_ddi_vswing_sequence (encoder, level); +else +bxt_ddi_vswing_sequence (dev_priv, level, port, encoder->type); + +return 0 ; +} + +uint32_t ddi_signal_levels (struct intel_dp *intel_dp) +{ +struct intel_digital_port *dport =dp_to_dig_port (intel_dp); +struct drm_i915_private *dev_priv =to_i915 (dport->base.base.dev); +struct intel_encoder *encoder = &dport->base;uint32_t level =intel_ddi_dp_level (intel_dp);if (IS_GEN9_BC (dev_priv)) -skl_ddi_set_iboost (encoder, level); -else if (IS_GEN9_LP (dev_priv)) -bxt_ddi_vswing_sequence (dev_priv, level, port, encoder->type); -else if (IS_CANNONLAKE (dev_priv)) { -cnl_ddi_vswing_sequence (encoder, level); -/* DDI_BUF_CTL bits 27:24 are reserved on CNL */ -return 0 ; - } +skl_ddi_set_iboost (encoder, level); +return DDI_BUF_TRANS_SELECT (level); }
drivers/gpu/drm/i915/intel_dp.c +4 -6
@@ -3506,13 +3506,11 @@ intel_dp_set_signal_levels(struct intel_dp *intel_dp)uint32_t signal_levels, mask =0 ;uint8_t train_set = intel_dp->train_set[0 ]; -if (HAS_DDI (dev_priv)) { +if (IS_GEN9_LP (dev_priv) ||IS_CANNONLAKE (dev_priv)) { + signal_levels =bxt_signal_levels (intel_dp); + }else if (HAS_DDI (dev_priv)) { signal_levels =ddi_signal_levels (intel_dp); - -if (IS_GEN9_LP (dev_priv) ||IS_CANNONLAKE (dev_priv)) - signal_levels =0 ; -else - mask =DDI_BUF_EMP_MASK ; + mask =DDI_BUF_EMP_MASK ; }else if (IS_CHERRYVIEW (dev_priv)) { signal_levels =chv_signal_levels (intel_dp); }else if (IS_VALLEYVIEW (dev_priv)) {
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -1271,6 +1271,7 @@ void intel_ddi_clock_get(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config);void intel_ddi_set_vc_payload_alloc (const struct intel_crtc_state *crtc_state,bool state); +u32 bxt_signal_levels (struct intel_dp *intel_dp);uint32_t ddi_signal_levels (struct intel_dp *intel_dp);u8 intel_ddi_dp_voltage_max (struct intel_encoder *encoder);
Signature · 6 lines
2.13.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 3/4 drm/i915: Align vswing sequences with old ddi buffer registers.
In reply to Rodrigo ViviVswing sequences on BXT and CNL are equivalent to the ddi buffer registers setting on other platforms.
For some reason it got aligned with skl_ddi_set_iboost what is semantically incorrect. This forced us to keep skipping ddi buffer translation tables on the platforms that has the vswing sequences.
v2: Don't mess with DP signal levels on this patch.
--- drivers/gpu/drm/i915/intel_ddi.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +10 -12
@@ -688,9 +688,6 @@ static void intel_prepare_dp_ddi_buffers(struct intel_encoder *encoder)enum port port =intel_ddi_get_encoder_port (encoder);const struct ddi_buf_trans *ddi_translations; -if (IS_GEN9_LP (dev_priv)) -return ; -switch (encoder->type) {case INTEL_OUTPUT_EDP : ddi_translations = intel_ddi_get_buf_trans_edp(dev_priv,
@@ -741,9 +738,6 @@ static void intel_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder)enum port port =intel_ddi_get_encoder_port (encoder);const struct ddi_buf_trans *ddi_translations_hdmi; -if (IS_GEN9_LP (dev_priv)) -return ; - hdmi_level =intel_ddi_hdmi_level (dev_priv, port);if (IS_GEN9_BC (dev_priv)) {
@@ -2151,7 +2145,9 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,intel_display_power_get (dev_priv, dig_port->ddi_io_power_domain); -intel_prepare_dp_ddi_buffers (encoder); +if (!IS_GEN9_LP (dev_priv) && !IS_CANNONLAKE (dev_priv)) +intel_prepare_dp_ddi_buffers (encoder); +intel_ddi_init_dp_buf_reg (encoder);intel_dp_sink_dpms (intel_dp,DRM_MODE_DPMS_ON );intel_dp_start_link_train (intel_dp);
@@ -2177,14 +2173,16 @@ static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder,intel_display_power_get (dev_priv, dig_port->ddi_io_power_domain); -intel_prepare_hdmi_ddi_buffers (encoder); -if (IS_GEN9_BC (dev_priv)) -skl_ddi_set_iboost (encoder, level); +if (IS_CANNONLAKE (dev_priv)) +cnl_ddi_vswing_sequence (encoder, level);else if (IS_GEN9_LP (dev_priv))bxt_ddi_vswing_sequence (dev_priv, level, port,INTEL_OUTPUT_HDMI ); -else if (IS_CANNONLAKE (dev_priv)) -cnl_ddi_vswing_sequence (encoder, level); +else +intel_prepare_hdmi_ddi_buffers (encoder); + +if (IS_GEN9_BC (dev_priv)) +skl_ddi_set_iboost (encoder, level); intel_hdmi->set_infoframes(drm_encoder, has_hdmi_sink,
Signature · 6 lines
2.13.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerRFC PATCH 4/4 drm/i915: Enable voltage swing before enabling DDI_BUF_CTL.
In reply to Rodrigo ViviSequences for DisplayPort asks us to
" Configure voltage swing and related IO settings. Refer to DDI Buffer section."
before "Configure and enable DDI_BUF_CTL"
On BXT and CNL this means to execute the ddi vswing sequences.
At this point these sequences calls are getting duplicated for DP because they are all called from DP link trainning sequences.
However this patch is not yet removing it before a futher discussion since spec also allows that during link training without disabling anything:
"
Notes
Changing voltage swing during link training:
Change the swing setting following the DDI Buffer section. The port does not need to be disabled.
"
--- drivers/gpu/drm/i915/intel_ddi.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_ddi.c +6 -1
@@ -2133,6 +2133,7 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);enum port port =intel_ddi_get_encoder_port (encoder);struct intel_digital_port *dig_port =enc_to_dig_port (&encoder->base); +uint32_t level =intel_ddi_dp_level (intel_dp);WARN_ON (link_mst && (port ==PORT_A || port ==PORT_E ));
@@ -2145,7 +2146,11 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,intel_display_power_get (dev_priv, dig_port->ddi_io_power_domain); -if (!IS_GEN9_LP (dev_priv) && !IS_CANNONLAKE (dev_priv)) +if (IS_CANNONLAKE (dev_priv)) +cnl_ddi_vswing_sequence (encoder, level); +else if (IS_GEN9_LP (dev_priv)) +bxt_ddi_vswing_sequence (dev_priv, level, port, encoder->type); +else intel_prepare_dp_ddi_buffers (encoder);intel_ddi_init_dp_buf_reg (encoder);
Signature · 6 lines
2.13.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC PATCH 4/4] drm/i915: Enable voltage swing before enabling DDI_BUF_CTL.
Quoted 41 lines · Rodrigo Vivi
Sequences for DisplayPort asks us to
" Configure voltage swing and related IO settings. Refer to DDI Buffer section."before "Configure and enable
DDI_BUF_CTL"On BXT and CNL this means to execute the ddi vswing sequences.
At this point these sequences calls are getting duplicated for DP because they are all called from DP link trainning sequences.
However this patch is not yet removing it before a futher discussion since spec also allows that during link training without disabling anything:
"
Notes
Changing voltage swing during link training:
Change the swing setting following the DDI Buffer section. The port does not need to be disabled.
"Cc Ville Syrjälä <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/intel_ddi.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_ddi.c +1
-0@@ -2133,6 +2133,7 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);enum port port =intel_ddi_get_encoder_port (encoder);struct intel_digital_port *dig_port =enc_to_dig_port (&encoder->base); +uint32_t level =intel_ddi_dp_level (intel_dp);WARN_ON (link_mst && (port ==PORT_A || port ==PORT_E ));
drivers/gpu/drm/i915/intel_ddi.c static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder, · line 2152
Quoted 8 lines
drivers/gpu/drm/i915/intel_ddi.c +4
-1@@ -2145,7 +2146,11 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,intel_display_power_get (dev_priv, dig_port->ddi_io_power_domain); -if (!IS_GEN9_LP (dev_priv) && !IS_CANNONLAKE (dev_priv)) +if (IS_CANNONLAKE (dev_priv)) +cnl_ddi_vswing_sequence (encoder, level); +else if (IS_GEN9_LP (dev_priv)) +bxt_ddi_vswing_sequence (dev_priv, level, port, encoder->type);
Hmm. Yeah, I guess it would make sense to set these up already before we enable DDI_BUF_CTL, which I think would happend from the .prepare_link_retrain() hook on DDI, and that does get called before the signal levels have been set up.
So I'm fine with this change. Imre, any thoughts?
Quoted 6 lines
drivers/gpu/drm/i915/intel_ddi.c +1
-0+else intel_prepare_dp_ddi_buffers (encoder);intel_ddi_init_dp_buf_reg (encoder);Signature · 1 line
2.13.2
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/4] drm/i915: Introduce intel_ddi_dp_level.
In reply to Rodrigo Vivi== Series Details ==
== Series Details ==
Series: series starting with [1/4] drm/i915: Introduce intel_ddi_dp_level.
URL : https://patchwork.freedesktop.org/series/28883/
State : success
== Summary ==
Series 28883v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/28883/revisions/1/mbox/
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
pass -> DMESG-WARN (fi-byt-n2820) fdo#101705fdo#101705 https://bugs.freedesktop.org/show_bug.cgi?id=101705
fi-bdw-5557u total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:447s fi-bdw-gvtdvm total:279 pass:265 dwarn:0 dfail:0 fail:0 skip:14 time:436s fi-blb-e6850 total:279 pass:224 dwarn:1 dfail:0 fail:0 skip:54 time:363s fi-bsw-n3050 total:279 pass:243 dwarn:0 dfail:0 fail:0 skip:36 time:547s fi-bxt-j4205 total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:516s fi-byt-j1900 total:279 pass:254 dwarn:1 dfail:0 fail:0 skip:24 time:530s fi-byt-n2820 total:279 pass:250 dwarn:1 dfail:0 fail:0 skip:28 time:513s fi-glk-2a total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:613s fi-hsw-4770 total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:441s fi-hsw-4770r total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:423s fi-ilk-650 total:279 pass:229 dwarn:0 dfail:0 fail:0 skip:50 time:428s fi-ivb-3520m total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:514s fi-ivb-3770 total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:474s fi-kbl-7500u total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:477s fi-kbl-7560u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:591s fi-kbl-r total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:599s fi-pnv-d510 total:279 pass:223 dwarn:1 dfail:0 fail:0 skip:55 time:530s fi-skl-6260u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:465s fi-skl-6700k total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:475s fi-skl-6770hq total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:491s fi-skl-gvtdvm total:279 pass:266 dwarn:0 dfail:0 fail:0 skip:13 time:441s fi-skl-x1585l total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:485s fi-snb-2520m total:279 pass:251 dwarn:0 dfail:0 fail:0 skip:28 time:544s fi-snb-2600 total:279 pass:250 dwarn:0 dfail:0 fail:0 skip:29 time:407s
ada53b43f81fe618f3f0f1dfbd3dd776bb277323 drm-tip: 2017y-08m-16d-15h-18m-56s UTC integration manifest b8e68d8b5ca9 drm/i915: Enable voltage swing before enabling DDI_BUF_CTL. 11ece39d2894 drm/i915: Align vswing sequences with old ddi buffer registers. e244f9770ac8 drm/i915: decouple gen9 and gen10 dp signal levels.d6ca027ec20b drm/i915: Introduce intel_ddi_dp_level.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5417/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx