Unduplicate CHV phy code
Subsystems (2)
v3 cover Unduplicate CHV phy code
I messed up the in-reply-to field while sending a couple of updated patches, so patchwork didn't catch the new revision. Sending again so these get another run of CI.
Ander
Ander Conselvan de Oliveira (10):
drm/i915: Set crtc_state->lane_count for HDMI drm/i915: Unduplicate CHV signal level code drm/i915: Unduplicate chv_data_lane_soft_reset() drm/i915: Unduplicate CHV phy-releated pre pll enabling code drm/i915: Unduplicate CHV pre-encoder enabling phy logic drm/i915: Unduplicate CHV encoders' post pll disable code drm/i915: Unduplicate VLV signal level code drm/i915: Unduplicate VLV phy pre pll enabling code drm/i915: Unduplicate pre encoder enabling phy code drm/i915: Move VLV HDMI lane reset work around logic to
intel_dpio_phy.c
drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.h | 18 ++ drivers/gpu/drm/i915/intel_ddi.c | 4 +- drivers/gpu/drm/i915/intel_dp.c | 412 ++--------------------------- drivers/gpu/drm/i915/intel_dpio_phy.c | 470 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 5 + drivers/gpu/drm/i915/intel_hdmi.c | 356 +------------------------ 7 files changed, 526 insertions(+), 740 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_dpio_phy.c
Signature · 6 lines
2.4.11 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/10 drm/i915: Set crtc_state->lane_count for HDMI
Set the lane count for HDMI to 4. This will make it easier to unduplicate CHV phy code.
v2: Set lane_count in *_get_config() to please state checker. (0day)
v3: Set lane_count for DDI in DVI mode too. (CI)
--- drivers/gpu/drm/i915/intel_ddi.c | 4 +++- drivers/gpu/drm/i915/intel_hdmi.c | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_ddi.c +3 -1
@@ -2173,8 +2173,10 @@ void intel_ddi_get_config(struct intel_encoder *encoder,if (intel_hdmi->infoframe_enabled (&encoder->base, pipe_config)) pipe_config->has_infoframe = true; -break ; +/* fall through */ case TRANS_DDI_MODE_SELECT_DVI : + pipe_config->lane_count =4 ; +break ;case TRANS_DDI_MODE_SELECT_FDI :break ;case TRANS_DDI_MODE_SELECT_DP_SST :
drivers/gpu/drm/i915/intel_hdmi.c +4 -0
@@ -953,6 +953,8 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder, dotclock /= pipe_config->pixel_multiplier; pipe_config->base.adjusted_mode.crtc_clock = dotclock; + + pipe_config->lane_count =4 ; }static void intel_enable_hdmi_audio (struct intel_encoder *encoder)
@@ -1337,6 +1339,8 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,/* Set user selected PAR to incoming mode's member */ adjusted_mode->picture_aspect_ratio = intel_hdmi->aspect_ratio; + pipe_config->lane_count =4 ; +return true; }
Signature · 6 lines
2.4.11 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 2/10 drm/i915: Unduplicate CHV signal level code
In reply to Ander Conselvan de OliveiraThe code for programming voltage swing and emphasis was duplicated between DP and HDMI code. Move that to a new file, intel_dpio_phy.c.
v2: Keep the "Use 800mV-0dB" comment in the HDMI code. (Ville)
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.h | 5 ++ drivers/gpu/drm/i915/intel_dp.c | 103 ++-------------------------- drivers/gpu/drm/i915/intel_dpio_phy.c | 122 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_hdmi.c | 70 +------------------ 5 files changed, 136 insertions(+), 165 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_dpio_phy.c
drivers/gpu/drm/i915/Makefile +1 -0
@@ -59,6 +59,7 @@ i915-y += intel_audio.o \ intel_bios.o \ intel_color.o \ intel_display.o \ + intel_dpio_phy.o \ intel_dpll_mgr.o \ intel_fbc.o \ intel_fifo_underrun.o \
drivers/gpu/drm/i915/i915_drv.h +5 -0
@@ -3585,6 +3585,11 @@ void intel_sbi_write(struct drm_i915_private *dev_priv, u16 reg, u32 value,u32 vlv_flisdsi_read (struct drm_i915_private *dev_priv,u32 reg);void vlv_flisdsi_write (struct drm_i915_private *dev_priv,u32 reg,u32 val); +/* intel_dpio_phy.c */ +void chv_set_phy_signal_level (struct intel_encoder *encoder, +u32 deemph_reg_value,u32 margin_reg_value, +bool uniq_trans_scale); +int intel_gpu_freq (struct drm_i915_private *dev_priv,int val);int intel_freq_opcode (struct drm_i915_private *dev_priv,int val);
drivers/gpu/drm/i915/intel_dp.c +6 -97
124 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dpio_phy.c new file +122 -0
122 lines not on this page · raw message
drivers/gpu/drm/i915/intel_hdmi.c +2 -68
79 lines not on this page · raw message
Signature · 6 lines
2.4.11 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 3/10 drm/i915: Unduplicate chv_data_lane_soft_reset()
In reply to Ander Conselvan de OliveiraThe function chv_data_lane_soft_reset() was duplicated in DP and HDMI code. Move it to intel_dpio_phy.c.
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/intel_dp.c | 44 ----------------------------------- drivers/gpu/drm/i915/intel_dpio_phy.c | 43 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_hdmi.c | 44 ----------------------------------- 4 files changed, 45 insertions(+), 88 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -3589,6 +3589,8 @@ void vlv_flisdsi_write(struct drm_i915_private *dev_priv, u32 reg, u32 val);void chv_set_phy_signal_level (struct intel_encoder *encoder,u32 deemph_reg_value,u32 margin_reg_value,bool uniq_trans_scale); +void chv_data_lane_soft_reset (struct intel_encoder *encoder, +bool reset);int intel_gpu_freq (struct drm_i915_private *dev_priv,int val);int intel_freq_opcode (struct drm_i915_private *dev_priv,int val);
drivers/gpu/drm/i915/intel_dp.c +0 -44
50 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dpio_phy.c +43 -0
46 lines not on this page · raw message
drivers/gpu/drm/i915/intel_hdmi.c +0 -44
50 lines not on this page · raw message
Signature · 6 lines
2.4.11 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 4/10 drm/i915: Unduplicate CHV phy-releated pre pll enabling code
In reply to Ander Conselvan de OliveiraThe same logic is used for DP and HDMI so move it to intel_dpio_phy.c.
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_dp.c | 83 +---------------------------------- drivers/gpu/drm/i915/intel_dpio_phy.c | 81 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 5 +++ drivers/gpu/drm/i915/intel_hdmi.c | 74 +------------------------------ 5 files changed, 89 insertions(+), 155 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -3591,6 +3591,7 @@ void chv_set_phy_signal_level(struct intel_encoder *encoder, bool uniq_trans_scale);void chv_data_lane_soft_reset (struct intel_encoder *encoder,bool reset); +void chv_phy_pre_pll_enable (struct intel_encoder *encoder);int intel_gpu_freq (struct drm_i915_private *dev_priv,int val);int intel_freq_opcode (struct drm_i915_private *dev_priv,int val);
drivers/gpu/drm/i915/intel_dp.c +1 -82
97 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dpio_phy.c +81 -0
84 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +5 -0
@@ -1334,6 +1334,11 @@ bool intel_dp_source_supports_hbr2(struct intel_dp *intel_dp);bool intel_dp_get_link_status (struct intel_dp *intel_dp,uint8_t link_status[DP_LINK_STATUS_SIZE ]); +static inline unsigned int intel_dp_unused_lane_mask (int lane_count) +{ +return ~((1 << lane_count) -1 ) &0xf ; +} +/* intel_dp_mst.c */ int intel_dp_mst_encoder_init (struct intel_digital_port *intel_dig_port,int conn_id);void intel_dp_mst_encoder_cleanup (struct intel_digital_port *intel_dig_port);
drivers/gpu/drm/i915/intel_hdmi.c +1 -73
82 lines not on this page · raw message
Signature · 6 lines
2.4.11 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 5/10 drm/i915: Unduplicate CHV pre-encoder enabling phy logic
In reply to Ander Conselvan de OliveiraThe only difference between the DP and HDMI versions was the lane count. Since lane_count is now set appropriately for HDMI too, get rid of the duplication and move this to intel_dpio_phy.c
v2: Don't move comments about 2nd common lane staying alive. (Ville)
--- drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/intel_dp.c | 83 +------------------------------ drivers/gpu/drm/i915/intel_dpio_phy.c | 92 +++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_hdmi.c | 67 +------------------------ 4 files changed, 98 insertions(+), 146 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -3592,6 +3592,8 @@ void chv_set_phy_signal_level(struct intel_encoder *encoder,void chv_data_lane_soft_reset (struct intel_encoder *encoder,bool reset);void chv_phy_pre_pll_enable (struct intel_encoder *encoder); +void chv_phy_pre_encoder_enable (struct intel_encoder *encoder); +void chv_phy_release_cl2_override (struct intel_encoder *encoder);int intel_gpu_freq (struct drm_i915_private *dev_priv,int val);int intel_freq_opcode (struct drm_i915_private *dev_priv,int val);
drivers/gpu/drm/i915/intel_dp.c +2 -81
93 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dpio_phy.c +92 -0
95 lines not on this page · raw message
drivers/gpu/drm/i915/intel_hdmi.c +2 -65
80 lines not on this page · raw message
Signature · 6 lines
2.4.11 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 6/10 drm/i915: Unduplicate CHV encoders' post pll disable code
In reply to Ander Conselvan de OliveiraThe exact same code was used by HDMI and DP encoders, so move it to intel_dpio_phy.c.
v2: Fix typo in the commit message. (Jim Bride)
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_dp.c | 30 +----------------------------- drivers/gpu/drm/i915/intel_dpio_phy.c | 33 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_hdmi.c | 30 +----------------------------- 4 files changed, 36 insertions(+), 58 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -3594,6 +3594,7 @@ void chv_data_lane_soft_reset(struct intel_encoder *encoder,void chv_phy_pre_pll_enable (struct intel_encoder *encoder);void chv_phy_pre_encoder_enable (struct intel_encoder *encoder);void chv_phy_release_cl2_override (struct intel_encoder *encoder); +void chv_phy_post_disable (struct intel_encoder *encoder);int intel_gpu_freq (struct drm_i915_private *dev_priv,int val);int intel_freq_opcode (struct drm_i915_private *dev_priv,int val);
drivers/gpu/drm/i915/intel_dp.c +1 -29
@@ -2838,35 +2838,7 @@ static void chv_dp_pre_pll_enable(struct intel_encoder *encoder)static void chv_dp_post_pll_disable (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -enum pipe pipe =to_intel_crtc (encoder->base.crtc)->pipe; -u32 val; - -mutex_lock (&dev_priv->sb_lock); - -/* disable left/right clock distribution */ -if (pipe !=PIPE_B ) { - val =vlv_dpio_read (dev_priv, pipe, _CHV_CMN_DW5_CH0); - val &= ~(CHV_BUFLEFTENA1_MASK |CHV_BUFRIGHTENA1_MASK ); -vlv_dpio_write (dev_priv, pipe, _CHV_CMN_DW5_CH0, val); - }else { - val =vlv_dpio_read (dev_priv, pipe, _CHV_CMN_DW1_CH1); - val &= ~(CHV_BUFLEFTENA2_MASK |CHV_BUFRIGHTENA2_MASK ); -vlv_dpio_write (dev_priv, pipe, _CHV_CMN_DW1_CH1, val); - } - -mutex_unlock (&dev_priv->sb_lock); - -/* -* Leave the power down bit cleared for at least one -* lane so that chv_powergate_phy_ch() will power -* on something when the channel is otherwise unused. -* When the port is off and the override is removed -* the lanes power down anyway, so otherwise it doesn't -* really matter what the state of power down bits is -* after this. -*/ -chv_phy_powergate_lanes (encoder, false,0x0 ); +chv_phy_post_disable (encoder); }/*
drivers/gpu/drm/i915/intel_dpio_phy.c +33 -0
@@ -336,3 +336,36 @@ void chv_phy_release_cl2_override(struct intel_encoder *encoder) dport->release_cl2_override = false; } } + +void chv_phy_post_disable (struct intel_encoder *encoder) +{ +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +enum pipe pipe =to_intel_crtc (encoder->base.crtc)->pipe; +u32 val; + +mutex_lock (&dev_priv->sb_lock); + +/* disable left/right clock distribution */ +if (pipe !=PIPE_B ) { + val =vlv_dpio_read (dev_priv, pipe, _CHV_CMN_DW5_CH0); + val &= ~(CHV_BUFLEFTENA1_MASK |CHV_BUFRIGHTENA1_MASK ); +vlv_dpio_write (dev_priv, pipe, _CHV_CMN_DW5_CH0, val); + }else { + val =vlv_dpio_read (dev_priv, pipe, _CHV_CMN_DW1_CH1); + val &= ~(CHV_BUFLEFTENA2_MASK |CHV_BUFRIGHTENA2_MASK ); +vlv_dpio_write (dev_priv, pipe, _CHV_CMN_DW1_CH1, val); + } + +mutex_unlock (&dev_priv->sb_lock); + +/* +* Leave the power down bit cleared for at least one +* lane so that chv_powergate_phy_ch() will power +* on something when the channel is otherwise unused. +* When the port is off and the override is removed +* the lanes power down anyway, so otherwise it doesn't +* really matter what the state of power down bits is +* after this. +*/ +chv_phy_powergate_lanes (encoder, false,0x0 ); +}
drivers/gpu/drm/i915/intel_hdmi.c +1 -29
@@ -1667,35 +1667,7 @@ static void chv_hdmi_pre_pll_enable(struct intel_encoder *encoder)static void chv_hdmi_post_pll_disable (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -enum pipe pipe =to_intel_crtc (encoder->base.crtc)->pipe; -u32 val; - -mutex_lock (&dev_priv->sb_lock); - -/* disable left/right clock distribution */ -if (pipe !=PIPE_B ) { - val =vlv_dpio_read (dev_priv, pipe, _CHV_CMN_DW5_CH0); - val &= ~(CHV_BUFLEFTENA1_MASK |CHV_BUFRIGHTENA1_MASK ); -vlv_dpio_write (dev_priv, pipe, _CHV_CMN_DW5_CH0, val); - }else { - val =vlv_dpio_read (dev_priv, pipe, _CHV_CMN_DW1_CH1); - val &= ~(CHV_BUFLEFTENA2_MASK |CHV_BUFRIGHTENA2_MASK ); -vlv_dpio_write (dev_priv, pipe, _CHV_CMN_DW1_CH1, val); - } - -mutex_unlock (&dev_priv->sb_lock); - -/* -* Leave the power down bit cleared for at least one -* lane so that chv_powergate_phy_ch() will power -* on something when the channel is otherwise unused. -* When the port is off and the override is removed -* the lanes power down anyway, so otherwise it doesn't -* really matter what the state of power down bits is -* after this. -*/ -chv_phy_powergate_lanes (encoder, false,0x0 ); +chv_phy_post_disable (encoder); }static void vlv_hdmi_post_disable (struct intel_encoder *encoder)
Signature · 6 lines
2.4.11 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 7/10 drm/i915: Unduplicate VLV signal level code
In reply to Ander Conselvan de OliveiraThe logic for setting signal levels is used for both HDMI and DP with small variations. But it is similar enough to put behind a function called from the encoders.
v2: Remove unrelated MST changes due to rebase fumble. (Jim Bride)
Fix typo in the commit message. (Jim Bride)
v3: Really fix the type. (Jim)
--- drivers/gpu/drm/i915/i915_drv.h | 4 ++++ drivers/gpu/drm/i915/intel_dp.c | 20 +++----------------- drivers/gpu/drm/i915/intel_dpio_phy.c | 26 ++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_hdmi.c | 14 ++++---------- 4 files changed, 37 insertions(+), 27 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +4 -0
@@ -3596,6 +3596,10 @@ void chv_phy_pre_encoder_enable(struct intel_encoder *encoder);void chv_phy_release_cl2_override (struct intel_encoder *encoder);void chv_phy_post_disable (struct intel_encoder *encoder); +void vlv_set_phy_signal_level (struct intel_encoder *encoder, +u32 demph_reg_value,u32 preemph_reg_value, +u32 uniqtranscale_reg_value,u32 tx3_demph); +int intel_gpu_freq (struct drm_i915_private *dev_priv,int val);int intel_freq_opcode (struct drm_i915_private *dev_priv,int val);
drivers/gpu/drm/i915/intel_dp.c +3 -17
@@ -2979,16 +2979,10 @@ intel_dp_pre_emphasis_max(struct intel_dp *intel_dp, uint8_t voltage_swing)static uint32_t vlv_signal_levels (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_digital_port *dport =dp_to_dig_port (intel_dp); -struct intel_crtc *intel_crtc = -to_intel_crtc (dport->base.base.crtc); +struct intel_encoder *encoder = &dp_to_dig_port (intel_dp)->base;unsigned long demph_reg_value, preemph_reg_value, uniqtranscale_reg_value;uint8_t train_set = intel_dp->train_set[0 ]; -enum dpio_channel port =vlv_dport_to_channel (dport); -int pipe = intel_crtc->pipe;switch (train_set &DP_TRAIN_PRE_EMPHASIS_MASK ) {case DP_TRAIN_PRE_EMPH_LEVEL_0 :
@@ -3063,16 +3057,8 @@ static uint32_t vlv_signal_levels(struct intel_dp *intel_dp)return 0 ; } -mutex_lock (&dev_priv->sb_lock); -vlv_dpio_write (dev_priv, pipe,VLV_TX_DW5 (port),0x00000000 ); -vlv_dpio_write (dev_priv, pipe,VLV_TX_DW4 (port), demph_reg_value); -vlv_dpio_write (dev_priv, pipe,VLV_TX_DW2 (port), - uniqtranscale_reg_value); -vlv_dpio_write (dev_priv, pipe,VLV_TX_DW3 (port),0x0C782040 ); -vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW11 (port),0x00030000 ); -vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW9 (port), preemph_reg_value); -vlv_dpio_write (dev_priv, pipe,VLV_TX_DW5 (port),0x80000000 ); -mutex_unlock (&dev_priv->sb_lock); +vlv_set_phy_signal_level (encoder, demph_reg_value, preemph_reg_value, + uniqtranscale_reg_value,0 );return 0 ; }
drivers/gpu/drm/i915/intel_dpio_phy.c +26 -0
@@ -369,3 +369,29 @@ void chv_phy_post_disable(struct intel_encoder *encoder)*/ chv_phy_powergate_lanes (encoder, false,0x0 ); } + +void vlv_set_phy_signal_level (struct intel_encoder *encoder, +u32 demph_reg_value,u32 preemph_reg_value, +u32 uniqtranscale_reg_value,u32 tx3_demph) +{ +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); +struct intel_digital_port *dport =enc_to_dig_port (&encoder->base); +enum dpio_channel port =vlv_dport_to_channel (dport); +int pipe = intel_crtc->pipe; + +mutex_lock (&dev_priv->sb_lock); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW5 (port),0x00000000 ); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW4 (port), demph_reg_value); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW2 (port), + uniqtranscale_reg_value); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW3 (port),0x0C782040 ); + +if (tx3_demph) +vlv_dpio_write (dev_priv, pipe,VLV_TX3_DW4 (port), tx3_demph); + +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW11 (port),0x00030000 ); +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW9 (port), preemph_reg_value); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW5 (port),DPIO_TX_OCALINIT_EN ); +mutex_unlock (&dev_priv->sb_lock); +}
drivers/gpu/drm/i915/intel_hdmi.c +4 -10
@@ -1601,21 +1601,15 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder) val |=0x001000c4 ;vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW8 (port), val); -/* HDMI 1.0V-2dB */ -vlv_dpio_write (dev_priv, pipe,VLV_TX_DW5 (port),0 ); -vlv_dpio_write (dev_priv, pipe,VLV_TX_DW4 (port),0x2b245f5f ); -vlv_dpio_write (dev_priv, pipe,VLV_TX_DW2 (port),0x5578b83a ); -vlv_dpio_write (dev_priv, pipe,VLV_TX_DW3 (port),0x0c782040 ); -vlv_dpio_write (dev_priv, pipe,VLV_TX3_DW4 (port),0x2b247878 ); -vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW11 (port),0x00030000 ); -vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW9 (port),0x00002000 ); -vlv_dpio_write (dev_priv, pipe,VLV_TX_DW5 (port),DPIO_TX_OCALINIT_EN ); -/* Program lane clock */ vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW14 (port),0x00760018 );vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW23 (port),0x00400888 );mutex_unlock (&dev_priv->sb_lock); +/* HDMI 1.0V-2dB */ +vlv_set_phy_signal_level (encoder,0x2b245f5f ,0x00002000 ,0x5578b83a , +0x2b247878 ); + intel_hdmi->set_infoframes (&encoder->base, intel_crtc->config->has_hdmi_sink, adjusted_mode);
Signature · 6 lines
2.4.11 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 8/10 drm/i915: Unduplicate VLV phy pre pll enabling code
In reply to Ander Conselvan de OliveiraThe code used by the DP and HDMI paths was very similar, so make them share it. Note that this removes the write to signal level registers from the HDMI pre pll enable path, but that's OK since those are set in vlv_hdmi_pre_enable() function.
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_dp.c | 25 +------------------------ drivers/gpu/drm/i915/intel_dpio_phy.c | 28 ++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_hdmi.c | 28 +--------------------------- 4 files changed, 31 insertions(+), 51 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -3599,6 +3599,7 @@ void chv_phy_post_disable(struct intel_encoder *encoder);void vlv_set_phy_signal_level (struct intel_encoder *encoder,u32 demph_reg_value,u32 preemph_reg_value,u32 uniqtranscale_reg_value,u32 tx3_demph); +void vlv_phy_pre_pll_enable (struct intel_encoder *encoder);int intel_gpu_freq (struct drm_i915_private *dev_priv,int val);int intel_freq_opcode (struct drm_i915_private *dev_priv,int val);
drivers/gpu/drm/i915/intel_dp.c +1 -24
@@ -2791,32 +2791,9 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder)static void vlv_dp_pre_pll_enable (struct intel_encoder *encoder) { -struct intel_digital_port *dport =enc_to_dig_port (&encoder->base); -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_crtc *intel_crtc = -to_intel_crtc (encoder->base.crtc); -enum dpio_channel port =vlv_dport_to_channel (dport); -int pipe = intel_crtc->pipe; -intel_dp_prepare (encoder); -/* Program Tx lane resets to default */ -mutex_lock (&dev_priv->sb_lock); -vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW0 (port), -DPIO_PCS_TX_LANE2_RESET | -DPIO_PCS_TX_LANE1_RESET ); -vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW1 (port), -DPIO_PCS_CLK_CRI_RXEB_EIOS_EN | -DPIO_PCS_CLK_CRI_RXDIGFILTSG_EN | - (1 <<DPIO_PCS_CLK_DATAWIDTH_SHIFT ) | -DPIO_PCS_CLK_SOFT_RESET ); - -/* Fix up inter-pair skew failure */ -vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW12 (port),0x00750f00 ); -vlv_dpio_write (dev_priv, pipe,VLV_TX_DW11 (port),0x00001500 ); -vlv_dpio_write (dev_priv, pipe,VLV_TX_DW14 (port),0x40400000 ); -mutex_unlock (&dev_priv->sb_lock); +vlv_phy_pre_pll_enable (encoder); }static void chv_pre_enable_dp (struct intel_encoder *encoder)
drivers/gpu/drm/i915/intel_dpio_phy.c +28 -0
@@ -395,3 +395,31 @@ void vlv_set_phy_signal_level(struct intel_encoder *encoder,vlv_dpio_write (dev_priv, pipe,VLV_TX_DW5 (port),DPIO_TX_OCALINIT_EN );mutex_unlock (&dev_priv->sb_lock); } + +void vlv_phy_pre_pll_enable (struct intel_encoder *encoder) +{ +struct intel_digital_port *dport =enc_to_dig_port (&encoder->base); +struct drm_device *dev = encoder->base.dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_crtc *intel_crtc = +to_intel_crtc (encoder->base.crtc); +enum dpio_channel port =vlv_dport_to_channel (dport); +int pipe = intel_crtc->pipe; + +/* Program Tx lane resets to default */ +mutex_lock (&dev_priv->sb_lock); +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW0 (port), +DPIO_PCS_TX_LANE2_RESET | +DPIO_PCS_TX_LANE1_RESET ); +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW1 (port), +DPIO_PCS_CLK_CRI_RXEB_EIOS_EN | +DPIO_PCS_CLK_CRI_RXDIGFILTSG_EN | + (1 <<DPIO_PCS_CLK_DATAWIDTH_SHIFT ) | +DPIO_PCS_CLK_SOFT_RESET ); + +/* Fix up inter-pair skew failure */ +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW12 (port),0x00750f00 ); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW11 (port),0x00001500 ); +vlv_dpio_write (dev_priv, pipe,VLV_TX_DW14 (port),0x40400000 ); +mutex_unlock (&dev_priv->sb_lock); +}
drivers/gpu/drm/i915/intel_hdmi.c +1 -27
@@ -1621,35 +1621,9 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)static void vlv_hdmi_pre_pll_enable (struct intel_encoder *encoder) { -struct intel_digital_port *dport =enc_to_dig_port (&encoder->base); -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_crtc *intel_crtc = -to_intel_crtc (encoder->base.crtc); -enum dpio_channel port =vlv_dport_to_channel (dport); -int pipe = intel_crtc->pipe; -intel_hdmi_prepare (encoder); -/* Program Tx lane resets to default */ -mutex_lock (&dev_priv->sb_lock); -vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW0 (port), -DPIO_PCS_TX_LANE2_RESET | -DPIO_PCS_TX_LANE1_RESET ); -vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW1 (port), -DPIO_PCS_CLK_CRI_RXEB_EIOS_EN | -DPIO_PCS_CLK_CRI_RXDIGFILTSG_EN | - (1 <<DPIO_PCS_CLK_DATAWIDTH_SHIFT ) | -DPIO_PCS_CLK_SOFT_RESET ); - -/* Fix up inter-pair skew failure */ -vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW12 (port),0x00750f00 ); -vlv_dpio_write (dev_priv, pipe,VLV_TX_DW11 (port),0x00001500 ); -vlv_dpio_write (dev_priv, pipe,VLV_TX_DW14 (port),0x40400000 ); - -vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW9 (port),0x00002000 ); -vlv_dpio_write (dev_priv, pipe,VLV_TX_DW5 (port),DPIO_TX_OCALINIT_EN ); -mutex_unlock (&dev_priv->sb_lock); +vlv_phy_pre_pll_enable (encoder); }static void chv_hdmi_pre_pll_enable (struct intel_encoder *encoder)
Signature · 6 lines
2.4.11 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 9/10 drm/i915: Unduplicate pre encoder enabling phy code
In reply to Ander Conselvan de OliveiraThe phy code in vlv_pre_enable_dp() and vlv_hdmi_pre_enable() is exectly the same, so extract it to intel_dpio_phy.c.
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_dp.c | 24 +----------------------- drivers/gpu/drm/i915/intel_dpio_phy.c | 30 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_hdmi.c | 19 +------------------ 4 files changed, 33 insertions(+), 41 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -3600,6 +3600,7 @@ void vlv_set_phy_signal_level(struct intel_encoder *encoder, u32 demph_reg_value, u32 preemph_reg_value, u32 uniqtranscale_reg_value, u32 tx3_demph);void vlv_phy_pre_pll_enable (struct intel_encoder *encoder); +void vlv_phy_pre_encoder_enable (struct intel_encoder *encoder);int intel_gpu_freq (struct drm_i915_private *dev_priv,int val);int intel_freq_opcode (struct drm_i915_private *dev_priv,int val);
drivers/gpu/drm/i915/intel_dp.c +1 -23
@@ -2762,29 +2762,7 @@ static void vlv_init_panel_power_sequencer(struct intel_dp *intel_dp)static void vlv_pre_enable_dp (struct intel_encoder *encoder) { -struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); -struct intel_digital_port *dport =dp_to_dig_port (intel_dp); -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -enum dpio_channel port =vlv_dport_to_channel (dport); -int pipe = intel_crtc->pipe; -u32 val; - -mutex_lock (&dev_priv->sb_lock); - - val =vlv_dpio_read (dev_priv, pipe,VLV_PCS01_DW8 (port)); - val =0 ; -if (pipe) - val |= (1 <<21 ); -else - val &= ~(1 <<21 ); - val |=0x001000c4 ; -vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW8 (port), val); -vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW14 (port),0x00760018 ); -vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW23 (port),0x00400888 ); - -mutex_unlock (&dev_priv->sb_lock); +vlv_phy_pre_encoder_enable (encoder);intel_enable_dp (encoder); }
drivers/gpu/drm/i915/intel_dpio_phy.c +30 -0
@@ -423,3 +423,33 @@ void vlv_phy_pre_pll_enable(struct intel_encoder *encoder)vlv_dpio_write (dev_priv, pipe,VLV_TX_DW14 (port),0x40400000 );mutex_unlock (&dev_priv->sb_lock); } + +void vlv_phy_pre_encoder_enable (struct intel_encoder *encoder) +{ +struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); +struct intel_digital_port *dport =dp_to_dig_port (intel_dp); +struct drm_device *dev = encoder->base.dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); +enum dpio_channel port =vlv_dport_to_channel (dport); +int pipe = intel_crtc->pipe; +u32 val; + +mutex_lock (&dev_priv->sb_lock); + +/* Enable clock channels for this port */ + val =vlv_dpio_read (dev_priv, pipe,VLV_PCS01_DW8 (port)); + val =0 ; +if (pipe) + val |= (1 <<21 ); +else + val &= ~(1 <<21 ); + val |=0x001000c4 ; +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW8 (port), val); + +/* Program lane clock */ +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW14 (port),0x00760018 ); +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW23 (port),0x00400888 ); + +mutex_unlock (&dev_priv->sb_lock); +}
drivers/gpu/drm/i915/intel_hdmi.c +1 -18
@@ -1586,25 +1586,8 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder)struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc);const struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode; -enum dpio_channel port =vlv_dport_to_channel (dport); -int pipe = intel_crtc->pipe; -u32 val; - -/* Enable clock channels for this port */ -mutex_lock (&dev_priv->sb_lock); - val =vlv_dpio_read (dev_priv, pipe,VLV_PCS01_DW8 (port)); - val =0 ; -if (pipe) - val |= (1 <<21 ); -else - val &= ~(1 <<21 ); - val |=0x001000c4 ; -vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW8 (port), val); -/* Program lane clock */ -vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW14 (port),0x00760018 ); -vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW23 (port),0x00400888 ); -mutex_unlock (&dev_priv->sb_lock); +vlv_phy_pre_encoder_enable (encoder);/* HDMI 1.0V-2dB */ vlv_set_phy_signal_level(encoder, 0x2b245f5f, 0x00002000, 0x5578b83a,
Signature · 6 lines
2.4.11 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 10/10 drm/i915: Move VLV HDMI lane reset work around logic to intel_dpio_phy.c
In reply to Ander Conselvan de OliveiraThis moves the last phy specific code from the encoders to the phy specific file.
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_dpio_phy.c | 15 +++++++++++++++ drivers/gpu/drm/i915/intel_hdmi.c | 12 +----------- 3 files changed, 17 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -3601,6 +3601,7 @@ void vlv_set_phy_signal_level(struct intel_encoder *encoder, u32 uniqtranscale_reg_value, u32 tx3_demph);void vlv_phy_pre_pll_enable (struct intel_encoder *encoder);void vlv_phy_pre_encoder_enable (struct intel_encoder *encoder); +void vlv_phy_reset_lanes (struct intel_encoder *encoder);int intel_gpu_freq (struct drm_i915_private *dev_priv,int val);int intel_freq_opcode (struct drm_i915_private *dev_priv,int val);
drivers/gpu/drm/i915/intel_dpio_phy.c +15 -0
@@ -453,3 +453,18 @@ void vlv_phy_pre_encoder_enable(struct intel_encoder *encoder)mutex_unlock (&dev_priv->sb_lock); } + +void vlv_phy_reset_lanes (struct intel_encoder *encoder) +{ +struct intel_digital_port *dport =enc_to_dig_port (&encoder->base); +struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; +struct intel_crtc *intel_crtc = +to_intel_crtc (encoder->base.crtc); +enum dpio_channel port =vlv_dport_to_channel (dport); +int pipe = intel_crtc->pipe; + +mutex_lock (&dev_priv->sb_lock); +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW0 (port),0x00000000 ); +vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW1 (port),0x00e00060 ); +mutex_unlock (&dev_priv->sb_lock); +}
drivers/gpu/drm/i915/intel_hdmi.c +1 -11
@@ -1623,18 +1623,8 @@ static void chv_hdmi_post_pll_disable(struct intel_encoder *encoder)static void vlv_hdmi_post_disable (struct intel_encoder *encoder) { -struct intel_digital_port *dport =enc_to_dig_port (&encoder->base); -struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; -struct intel_crtc *intel_crtc = -to_intel_crtc (encoder->base.crtc); -enum dpio_channel port =vlv_dport_to_channel (dport); -int pipe = intel_crtc->pipe; -/* Reset lanes to avoid HDMI flicker (VLV w/a) */ -mutex_lock (&dev_priv->sb_lock); -vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW0 (port),0x00000000 ); -vlv_dpio_write (dev_priv, pipe,VLV_PCS_DW1 (port),0x00e00060 ); -mutex_unlock (&dev_priv->sb_lock); +vlv_phy_reset_lanes (encoder); }static void chv_hdmi_post_disable (struct intel_encoder *encoder)
Signature · 6 lines
2.4.11 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Unduplicate CHV phy code (rev4)
In reply to Ander Conselvan de Oliveira== Series Details ==
== Series Details ==
Series: Unduplicate CHV phy code (rev4)
URL : https://patchwork.freedesktop.org/series/5463/
State : success
== Summary ==
Series 5463v4 Unduplicate CHV phy code
http://patchwork.freedesktop.org/api/1.0/series/5463/revisions/4/mbox/
Test kms_pipe_crc_basic:
Subgroup hang-read-crc-pipe-c:
incomplete -> PASS (bdw-nuci7)bdw-nuci7 total:194 pass:182 dwarn:0 dfail:0 fail:0 skip:12 bdw-ultra total:194 pass:170 dwarn:0 dfail:0 fail:1 skip:23 bsw-nuc-2 total:193 pass:153 dwarn:0 dfail:0 fail:0 skip:40 byt-nuc total:193 pass:155 dwarn:0 dfail:0 fail:0 skip:38 hsw-brixbox total:194 pass:170 dwarn:0 dfail:0 fail:0 skip:24 hsw-gt2 total:194 pass:175 dwarn:0 dfail:0 fail:0 skip:19 ilk-hp8440p total:194 pass:137 dwarn:0 dfail:0 fail:0 skip:57 ivb-t430s total:194 pass:166 dwarn:0 dfail:0 fail:0 skip:28 skl-i7k-2 total:194 pass:168 dwarn:0 dfail:0 fail:1 skip:25 skl-nuci5 total:194 pass:183 dwarn:0 dfail:0 fail:0 skip:11 snb-dellxps total:193 pass:155 dwarn:0 dfail:0 fail:0 skip:38 snb-x220t total:193 pass:154 dwarn:0 dfail:0 fail:1 skip:38
Results at /archive/results/CI_IGT_test/Patchwork_1973/
9dabb0053b63bc32ab6ad5d13209d1e43395313f drm-intel-nightly: 2016y-04m-21d-09h-27m-12s UTC integration manifest 62760e6 drm/i915: Move VLV HDMI lane reset work around logic to intel_dpio_phy.c
c72a1fe drm/i915: Unduplicate pre encoder enabling phy code
a12499b drm/i915: Unduplicate VLV phy pre pll enabling code
561312a drm/i915: Unduplicate VLV signal level code
04c65e5 drm/i915: Unduplicate CHV encoders' post pll disable code
31ea416 drm/i915: Unduplicate CHV pre-encoder enabling phy logic
59eb0cd drm/i915: Unduplicate CHV phy-releated pre pll enabling code
53827a4 drm/i915: Unduplicate chv_data_lane_soft_reset()
66e06a6 drm/i915: Unduplicate CHV signal level code
6bb0034 drm/i915: Set crtc_state->lane_count for HDMI
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for Unduplicate CHV phy code (rev4)
In reply to Ander Conselvan de Oliveira== Series Details ==
== Series Details ==
Series: Unduplicate CHV phy code (rev4)
URL : https://patchwork.freedesktop.org/series/5463/
State : failure
== Summary ==
Series 5463v4 Unduplicate CHV phy code
http://patchwork.freedesktop.org/api/1.0/series/5463/revisions/4/mbox/
Test drv_module_reload_basic:
pass -> INCOMPLETE (skl-nuci5)
Test kms_force_connector_basic:
Subgroup force-load-detect:
pass -> SKIP (snb-x220t)
Subgroup prune-stale-modes:
pass -> SKIP (ilk-hp8440p)bdw-nuci7 total:193 pass:181 dwarn:0 dfail:0 fail:0 skip:12 bdw-ultra total:193 pass:170 dwarn:0 dfail:0 fail:0 skip:23 bsw-nuc-2 total:192 pass:153 dwarn:0 dfail:0 fail:0 skip:39 byt-nuc total:192 pass:154 dwarn:0 dfail:0 fail:0 skip:38 ilk-hp8440p total:193 pass:135 dwarn:0 dfail:0 fail:0 skip:58 ivb-t430s total:193 pass:165 dwarn:0 dfail:0 fail:0 skip:28 skl-i7k-2 total:193 pass:168 dwarn:0 dfail:0 fail:0 skip:25 skl-nuci5 total:171 pass:159 dwarn:0 dfail:0 fail:0 skip:11 snb-dellxps total:193 pass:155 dwarn:0 dfail:0 fail:0 skip:38 snb-x220t total:193 pass:154 dwarn:0 dfail:0 fail:1 skip:38
Results at /archive/results/CI_IGT_test/Patchwork_2016/
340c485ad98d0ec0369a3b18d4a09938f3f5537d drm-intel-nightly: 2016y-04m-22d-17h-32m-25s UTC integration manifest 616d6c5 drm/i915: Move VLV HDMI lane reset work around logic to intel_dpio_phy.c
f816a5b drm/i915: Unduplicate pre encoder enabling phy code
a2549b5 drm/i915: Unduplicate VLV phy pre pll enabling code
5039193 drm/i915: Unduplicate VLV signal level code
13874b7 drm/i915: Unduplicate CHV encoders' post pll disable code
d3a34e4 drm/i915: Unduplicate CHV pre-encoder enabling phy logic
0a2509b drm/i915: Unduplicate CHV phy-releated pre pll enabling code
e30171a drm/i915: Unduplicate chv_data_lane_soft_reset()
0ffec1a drm/i915: Unduplicate CHV signal level code
33d5a9a drm/i915: Set crtc_state->lane_count for HDMI
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx