Try to fix MST regression with DDI IO power domains
Subsystems (2)
v2 cover Try to fix MST regression with DDI IO power domains
Hi,
Here's a v2 of the fix for the regression caused by the recent DDI IO power domain changes. This time with moar patches and actual testing. The new patches remove the usage of crtc->config from intel_ddi.c and that also removes the oops with encoder->crtc being NULL.
Ander Conselvan de Oliveira (8):
drm/i915: Enable DDI IO power domains in the DP MST path drm/i915: Pass intel_crtc to fdi_link_train() hooks drm/i915: Pass intel_crtc to intel_lpt_pch_enable() drm/i915: Pass pipe_config to pch_enable() functions drm/i915: Pass pipe_config to fdi_link_train() functions drm/i915: Pass intel_crtc to DDI functions called from crtc en/disable drm/i915: Remove direct usages of intel_crtc->config from DDI code drm/i915: Remove duplicate DDI enabling logic from MST path
drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/intel_ddi.c | 103 +++++++++++++++++------------------ drivers/gpu/drm/i915/intel_display.c | 100 +++++++++++++++++----------------- drivers/gpu/drm/i915/intel_dp_mst.c | 20 +------ drivers/gpu/drm/i915/intel_drv.h | 19 +++++-- 5 files changed, 117 insertions(+), 128 deletions(-)
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/8 drm/i915: Enable DDI IO power domains in the DP MST path
Commit 62b695662a24 ("drm/i915: Only enable DDI IO power domains after enabling DPLL") changed how the DDI IO power domains get enabled, but neglected the need to enable those domains when enabling a DP connector with MST enabled, leading to
Kernel panic - not syncing: Timeout: Not all CPUs entered broadcast exception handler
--- drivers/gpu/drm/i915/intel_dp_mst.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/intel_dp_mst.c +3 -0
@@ -163,6 +163,9 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder,intel_ddi_clk_select (&intel_dig_port->base, pipe_config->shared_dpll); +intel_display_power_get (dev_priv, + intel_dig_port->ddi_io_power_domain); +intel_prepare_dp_ddi_buffers (&intel_dig_port->base); intel_dp_set_link_params(intel_dp, pipe_config->port_clock,
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 1/8] drm/i915: Enable DDI IO power domains in the DP MST path
Quoted 7 lines · Ander Conselvan de Oliveira
Commit
62b695662a24("drm/i915: Only enable DDI IO power domains after enabling DPLL") changed how the DDI IO power domains get enabled, but neglected the need to enable those domains when enabling a DP connector with MST enabled, leading toKernel panic - not syncing: Timeout: Not all CPUs entered broadcast exception handler
Quoted 11 lines
Fixes 62b695662a24 ("drm/i915: Only enable DDI IO power domains after enabling DPLL")Cc David Weinehall <[email protected]>Cc Imre Deak <[email protected]>Cc Ander Conselvan de Oliveira <[email protected]>Cc David Weinehall <[email protected]>Cc Daniel Vetter <[email protected]>Cc Jani Nikula <[email protected]>Cc Ville Syrjälä <[email protected]>Reported-by Ville Syrjälä <[email protected]>Signed-off-by Ander Conselvan de Oliveira <[email protected]>
This was already
Pushed this one so the regression is fixed. Thanks for reviewing.
Ander
Quoted 9 lines
--- drivers/gpu/drm/i915/intel_dp_mst.c | 3 +++ 1 file changed, 3 insertions(+)drivers/gpu/drm/i915/intel_dp_mst.c +0
-0
drivers/gpu/drm/i915/intel_dp_mst.c static void intel_mst_pre_enable_dp(struct intel_encoder *encoder, · line 171
Quoted 9 lines
drivers/gpu/drm/i915/intel_dp_mst.c +3
-0@@ -163,6 +163,9 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder,intel_ddi_clk_select (&intel_dig_port->base, pipe_config->shared_dpll); +intel_display_power_get (dev_priv, + intel_dig_port->ddi_io_power_domain); +intel_prepare_dp_ddi_buffers (&intel_dig_port->base); intel_dp_set_link_params(intel_dp, pipe_config->port_clock,
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/8 drm/i915: Pass intel_crtc to fdi_link_train() hooks
In reply to Ander Conselvan de OliveiraThe implementation of the fdi_link_train() hooks need an intel_crtc so just pass that instead of the generic crtc type.
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 13 ++++---- drivers/gpu/drm/i915/intel_display.c | 63 +++++++++++++++++------------------- drivers/gpu/drm/i915/intel_drv.h | 2 +- 4 files changed, 37 insertions(+), 43 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -669,7 +669,7 @@ struct drm_i915_display_funcs {struct intel_encoder *encoder, const struct drm_display_mode *adjusted_mode);void (*audio_codec_disable)(struct intel_encoder *encoder); -void (*fdi_link_train)(struct drm_crtc *crtc); +void (*fdi_link_train)(struct intel_crtc *crtc);void (*init_clock_gating)(struct drm_i915_private *dev_priv); int (*queue_flip)(struct drm_device *dev, struct drm_crtc *crtc, struct drm_framebuffer *fb,
drivers/gpu/drm/i915/intel_ddi.c +6 -7
@@ -674,15 +674,14 @@ static uint32_t hsw_pll_to_ddi_pll_sel(struct intel_shared_dpll *pll)* DDI A (which is used for eDP) */ -void hsw_fdi_link_train (struct drm_crtc *crtc) +void hsw_fdi_link_train (struct intel_crtc *crtc) { -struct drm_device *dev = crtc->dev; +struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *intel_crtc =to_intel_crtc (crtc);struct intel_encoder *encoder;u32 temp, i, rx_ctl_val, ddi_pll_sel; -for_each_encoder_on_crtc (dev, crtc, encoder) { +for_each_encoder_on_crtc (dev, &crtc->base, encoder) {WARN_ON (encoder->type !=INTEL_OUTPUT_ANALOG );intel_prepare_dp_ddi_buffers (encoder); }
@@ -701,7 +700,7 @@ 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 | -FDI_DP_PORT_WIDTH (intel_crtc->config->fdi_lanes); +FDI_DP_PORT_WIDTH (crtc->config->fdi_lanes);I915_WRITE (FDI_RX_CTL (PIPE_A ), rx_ctl_val);POSTING_READ (FDI_RX_CTL (PIPE_A ));udelay (220 );
@@ -711,7 +710,7 @@ void hsw_fdi_link_train(struct drm_crtc *crtc)I915_WRITE (FDI_RX_CTL (PIPE_A ), rx_ctl_val);/* Configure Port Clock Select */ - ddi_pll_sel =hsw_pll_to_ddi_pll_sel (intel_crtc->config->shared_dpll); + ddi_pll_sel =hsw_pll_to_ddi_pll_sel (crtc->config->shared_dpll);I915_WRITE (PORT_CLK_SEL (PORT_E ), ddi_pll_sel);WARN_ON (ddi_pll_sel !=PORT_CLK_SEL_SPLL );
@@ -731,7 +730,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->config->fdi_lanes -1 ) <<1 ) | + ((crtc->config->fdi_lanes -1 ) <<1 ) |DDI_BUF_TRANS_SELECT (i /2 ));POSTING_READ (DDI_BUF_CTL (PORT_E ));
drivers/gpu/drm/i915/intel_display.c +29 -34
168 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +1 -1
@@ -1225,7 +1225,7 @@ void intel_ddi_fdi_post_disable(struct intel_encoder *intel_encoder,struct intel_crtc_state *old_crtc_state, struct drm_connector_state *old_conn_state);void intel_prepare_dp_ddi_buffers (struct intel_encoder *encoder); -void hsw_fdi_link_train (struct drm_crtc *crtc); +void hsw_fdi_link_train (struct intel_crtc *crtc);void intel_ddi_init (struct drm_i915_private *dev_priv,enum port port);enum port intel_ddi_get_encoder_port (struct intel_encoder *intel_encoder);bool intel_ddi_get_hw_state (struct intel_encoder *encoder,enum pipe *pipe);
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/8 drm/i915: Pass intel_crtc to intel_lpt_pch_enable()
In reply to Ander Conselvan de OliveiraThe function intel_lpt_pch_enable() needs an intel_crtc so pass that instead of the generic crtc type.
--- drivers/gpu/drm/i915/intel_display.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_display.c +8 -10
@@ -4250,10 +4250,10 @@ void lpt_disable_iclkip(struct drm_i915_private *dev_priv) }/* Program iCLKIP clock to the desired frequency */ -static void lpt_program_iclkip (struct drm_crtc *crtc) +static void lpt_program_iclkip (struct intel_crtc *crtc) { -struct drm_i915_private *dev_priv =to_i915 (crtc->dev); -int clock =to_intel_crtc (crtc)->config->base.adjusted_mode.crtc_clock; +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +int clock = crtc->config->base.adjusted_mode.crtc_clock;u32 divsel, phaseinc, auxdiv, phasedir =0 ;u32 temp;
@@ -4546,19 +4546,17 @@ static void ironlake_pch_enable(struct intel_crtc *crtc)ironlake_enable_pch_transcoder (dev_priv, pipe); } -static void lpt_pch_enable (struct drm_crtc *crtc) +static void lpt_pch_enable (struct intel_crtc *crtc) { -struct drm_device *dev = crtc->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder; +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;assert_pch_transcoder_disabled (dev_priv,TRANSCODER_A );lpt_program_iclkip (crtc);/* Set transcoder timing. */ -ironlake_pch_transcoder_set_timings (intel_crtc,PIPE_A ); +ironlake_pch_transcoder_set_timings (crtc,PIPE_A );lpt_enable_pch_transcoder (dev_priv, cpu_transcoder); }
@@ -5395,7 +5393,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,intel_enable_pipe (intel_crtc);if (intel_crtc->config->has_pch_encoder) -lpt_pch_enable (crtc); +lpt_pch_enable (intel_crtc);if (intel_crtc_has_type (intel_crtc->config,INTEL_OUTPUT_DP_MST ))intel_ddi_set_vc_payload_alloc (crtc, true);
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/8 drm/i915: Pass pipe_config to pch_enable() functions
In reply to Ander Conselvan de OliveiraUsing crtc->config directly is being removed in favor of passing a pipe_config. Follow the trend and pass pipe_config to pch_enable() functions.
--- drivers/gpu/drm/i915/intel_display.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_display.c +10 -8
@@ -4456,7 +4456,8 @@ intel_trans_dp_port_sel(struct intel_crtc *crtc)* - DP transcoding bits * - transcoder */ -static void ironlake_pch_enable (struct intel_crtc *crtc) +static void ironlake_pch_enable (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config) {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -4484,7 +4485,7 @@ static void ironlake_pch_enable(struct intel_crtc *crtc) temp =I915_READ (PCH_DPLL_SEL ); temp |=TRANS_DPLL_ENABLE (pipe); sel =TRANS_DPLLB_SEL (pipe); -if (crtc->config->shared_dpll == +if (pipe_config->shared_dpll ==intel_get_shared_dpll_by_id (dev_priv,DPLL_ID_PCH_PLL_B )) temp |= sel;else
@@ -4509,9 +4510,9 @@ static void ironlake_pch_enable(struct intel_crtc *crtc)/* For PCH DP, enable TRANS_DP_CTL */ if (HAS_PCH_CPT (dev_priv) && -intel_crtc_has_dp_encoder (crtc->config)) { +intel_crtc_has_dp_encoder (pipe_config)) {const struct drm_display_mode *adjusted_mode = - &crtc->config->base.adjusted_mode; + &pipe_config->base.adjusted_mode;u32 bpc = (I915_READ (PIPECONF (pipe)) &PIPECONF_BPC_MASK ) >>5 ;i915_reg_t reg =TRANS_DP_CTL (pipe); temp =I915_READ (reg);
@@ -4546,10 +4547,11 @@ static void ironlake_pch_enable(struct intel_crtc *crtc)ironlake_enable_pch_transcoder (dev_priv, pipe); } -static void lpt_pch_enable (struct intel_crtc *crtc) +static void lpt_pch_enable (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config) {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -enum transcoder cpu_transcoder = crtc->config->cpu_transcoder; +enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;assert_pch_transcoder_disabled (dev_priv,TRANSCODER_A );
@@ -5283,7 +5285,7 @@ static void ironlake_crtc_enable(struct intel_crtc_state *pipe_config,intel_enable_pipe (intel_crtc);if (intel_crtc->config->has_pch_encoder) -ironlake_pch_enable (intel_crtc); +ironlake_pch_enable (intel_crtc, pipe_config);assert_vblank_disabled (crtc);drm_crtc_vblank_on (crtc);
@@ -5393,7 +5395,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,intel_enable_pipe (intel_crtc);if (intel_crtc->config->has_pch_encoder) -lpt_pch_enable (intel_crtc); +lpt_pch_enable (intel_crtc, pipe_config);if (intel_crtc_has_type (intel_crtc->config,INTEL_OUTPUT_DP_MST ))intel_ddi_set_vc_payload_alloc (crtc, true);
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 4/8] drm/i915: Pass pipe_config to pch_enable() functions
Quoted 14 lines · Ander Conselvan de Oliveira
Using
crtc->configdirectly is being removed in favor of passing apipe_config. Follow the trend and passpipe_configtopch_enable()functions.Signed-off-by Ander Conselvan de Oliveira <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/intel_display.c +0
-0
drivers/gpu/drm/i915/intel_display.c intel_trans_dp_port_sel(struct intel_crtc *crtc) · line 4460
Quoted 6 lines
drivers/gpu/drm/i915/intel_display.c +2
-1@@ -4456,7 +4456,8 @@ intel_trans_dp_port_sel(struct intel_crtc *crtc)* - DP transcoding bits * - transcoder */ -static void ironlake_pch_enable (struct intel_crtc *crtc) +static void ironlake_pch_enable (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config)
const
Also s/pipe_config/crtc_state/ perhaps? IMO we should try to start unifying our naming convention to reduce the confusion a bit.
You could also pass just the state since you can dig up the crtc from there.
Quoted 25 lines
drivers/gpu/drm/i915/intel_display.c +3
-3{struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);@@ -4484,7 +4485,7 @@ static void ironlake_pch_enable(struct intel_crtc *crtc) temp =I915_READ (PCH_DPLL_SEL ); temp |=TRANS_DPLL_ENABLE (pipe); sel =TRANS_DPLLB_SEL (pipe); -if (crtc->config->shared_dpll == +if (pipe_config->shared_dpll ==intel_get_shared_dpll_by_id (dev_priv,DPLL_ID_PCH_PLL_B )) temp |= sel;else @@ -4509,9 +4510,9 @@ static void ironlake_pch_enable(struct intel_crtc *crtc)/* For PCH DP, enable TRANS_DP_CTL */ if (HAS_PCH_CPT (dev_priv) && -intel_crtc_has_dp_encoder (crtc->config)) { +intel_crtc_has_dp_encoder (pipe_config)) {const struct drm_display_mode *adjusted_mode = - &crtc->config->base.adjusted_mode; + &pipe_config->base.adjusted_mode;u32 bpc = (I915_READ (PIPECONF (pipe)) &PIPECONF_BPC_MASK ) >>5 ;i915_reg_t reg =TRANS_DP_CTL (pipe); temp =I915_READ (reg);
drivers/gpu/drm/i915/intel_display.c static void ironlake_pch_enable(struct intel_crtc *crtc) · line 4551
Quoted 6 lines
drivers/gpu/drm/i915/intel_display.c +2
-1@@ -4546,10 +4547,11 @@ static void ironlake_pch_enable(struct intel_crtc *crtc)ironlake_enable_pch_transcoder (dev_priv, pipe); } -static void lpt_pch_enable (struct intel_crtc *crtc) +static void lpt_pch_enable (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config)
ditto
Anyway looks correct, so w/ or w/o the extra ideas this is
Quoted 27 lines
drivers/gpu/drm/i915/intel_display.c +3
-3{struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -enum transcoder cpu_transcoder = crtc->config->cpu_transcoder; +enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;assert_pch_transcoder_disabled (dev_priv,TRANSCODER_A );@@ -5283,7 +5285,7 @@ static void ironlake_crtc_enable(struct intel_crtc_state *pipe_config,intel_enable_pipe (intel_crtc);if (intel_crtc->config->has_pch_encoder) -ironlake_pch_enable (intel_crtc); +ironlake_pch_enable (intel_crtc, pipe_config);assert_vblank_disabled (crtc);drm_crtc_vblank_on (crtc);@@ -5393,7 +5395,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,intel_enable_pipe (intel_crtc);if (intel_crtc->config->has_pch_encoder) -lpt_pch_enable (intel_crtc); +lpt_pch_enable (intel_crtc, pipe_config);if (intel_crtc_has_type (intel_crtc->config,INTEL_OUTPUT_DP_MST ))intel_ddi_set_vc_payload_alloc (crtc, true);Signature · 1 line
2.9.3
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915: Pass pipe_config to pch_enable() functions
Using crtc->config directly is being removed in favor of passing a pipe_config. Follow the trend and pass pipe_config to pch_enable() functions.
v2: s/pipe_config/crtc_state/ (Ville)
- constify crtc_state. (Ville)
- take crtc from crtc_state. (Ville)
--- drivers/gpu/drm/i915/intel_display.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_display.c +10 -8
@@ -4456,8 +4456,9 @@ intel_trans_dp_port_sel(struct intel_crtc *crtc)* - DP transcoding bits * - transcoder */ -static void ironlake_pch_enable (struct intel_crtc *crtc) +static void ironlake_pch_enable (const struct intel_crtc_state *crtc_state) { +struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);int pipe = crtc->pipe;
@@ -4484,7 +4485,7 @@ static void ironlake_pch_enable(struct intel_crtc *crtc) temp =I915_READ (PCH_DPLL_SEL ); temp |=TRANS_DPLL_ENABLE (pipe); sel =TRANS_DPLLB_SEL (pipe); -if (crtc->config->shared_dpll == +if (crtc_state->shared_dpll ==intel_get_shared_dpll_by_id (dev_priv,DPLL_ID_PCH_PLL_B )) temp |= sel;else
@@ -4509,9 +4510,9 @@ static void ironlake_pch_enable(struct intel_crtc *crtc)/* For PCH DP, enable TRANS_DP_CTL */ if (HAS_PCH_CPT (dev_priv) && -intel_crtc_has_dp_encoder (crtc->config)) { +intel_crtc_has_dp_encoder (crtc_state)) {const struct drm_display_mode *adjusted_mode = - &crtc->config->base.adjusted_mode; + &crtc_state->base.adjusted_mode;u32 bpc = (I915_READ (PIPECONF (pipe)) &PIPECONF_BPC_MASK ) >>5 ;i915_reg_t reg =TRANS_DP_CTL (pipe); temp =I915_READ (reg);
@@ -4546,10 +4547,11 @@ static void ironlake_pch_enable(struct intel_crtc *crtc)ironlake_enable_pch_transcoder (dev_priv, pipe); } -static void lpt_pch_enable (struct intel_crtc *crtc) +static void lpt_pch_enable (const struct intel_crtc_state *crtc_state) { +struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -enum transcoder cpu_transcoder = crtc->config->cpu_transcoder; +enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;assert_pch_transcoder_disabled (dev_priv,TRANSCODER_A );
@@ -5283,7 +5285,7 @@ static void ironlake_crtc_enable(struct intel_crtc_state *pipe_config,intel_enable_pipe (intel_crtc);if (intel_crtc->config->has_pch_encoder) -ironlake_pch_enable (intel_crtc); +ironlake_pch_enable (pipe_config);assert_vblank_disabled (crtc);drm_crtc_vblank_on (crtc);
@@ -5393,7 +5395,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,intel_enable_pipe (intel_crtc);if (intel_crtc->config->has_pch_encoder) -lpt_pch_enable (intel_crtc); +lpt_pch_enable (pipe_config);if (intel_crtc_has_type (intel_crtc->config,INTEL_OUTPUT_DP_MST ))intel_ddi_set_vc_payload_alloc (crtc, true);
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915: Pass pipe_config to pch_enable() functions
Quoted 7 lines · Ander Conselvan de Oliveira
Using
crtc->configdirectly is being removed in favor of passing apipe_config. Follow the trend and passpipe_configtopch_enable()functions.v2: s/pipe_config/crtc_state/ (Ville)
- constifycrtc_state. (Ville)
- take crtc fromcrtc_state. (Ville)
Neat. The other patches in the series could also benefit from these tricks. I'd like to at least see the consts sprinkled around to make people think twice before they touch the state in the wrong place. The other changes are optional.
With the consts, patches 2-7 are also
Quoted 76 lines
Signed-off-by Ander Conselvan de Oliveira <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/intel_display.c +10
-8@@ -4456,8 +4456,9 @@ intel_trans_dp_port_sel(struct intel_crtc *crtc)* - DP transcoding bits * - transcoder */ -static void ironlake_pch_enable (struct intel_crtc *crtc) +static void ironlake_pch_enable (const struct intel_crtc_state *crtc_state) { +struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);int pipe = crtc->pipe;@@ -4484,7 +4485,7 @@ static void ironlake_pch_enable(struct intel_crtc *crtc) temp =I915_READ (PCH_DPLL_SEL ); temp |=TRANS_DPLL_ENABLE (pipe); sel =TRANS_DPLLB_SEL (pipe); -if (crtc->config->shared_dpll == +if (crtc_state->shared_dpll ==intel_get_shared_dpll_by_id (dev_priv,DPLL_ID_PCH_PLL_B )) temp |= sel;else @@ -4509,9 +4510,9 @@ static void ironlake_pch_enable(struct intel_crtc *crtc)/* For PCH DP, enable TRANS_DP_CTL */ if (HAS_PCH_CPT (dev_priv) && -intel_crtc_has_dp_encoder (crtc->config)) { +intel_crtc_has_dp_encoder (crtc_state)) {const struct drm_display_mode *adjusted_mode = - &crtc->config->base.adjusted_mode; + &crtc_state->base.adjusted_mode;u32 bpc = (I915_READ (PIPECONF (pipe)) &PIPECONF_BPC_MASK ) >>5 ;i915_reg_t reg =TRANS_DP_CTL (pipe); temp =I915_READ (reg);@@ -4546,10 +4547,11 @@ static void ironlake_pch_enable(struct intel_crtc *crtc)ironlake_enable_pch_transcoder (dev_priv, pipe); } -static void lpt_pch_enable (struct intel_crtc *crtc) +static void lpt_pch_enable (const struct intel_crtc_state *crtc_state) { +struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -enum transcoder cpu_transcoder = crtc->config->cpu_transcoder; +enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;assert_pch_transcoder_disabled (dev_priv,TRANSCODER_A );@@ -5283,7 +5285,7 @@ static void ironlake_crtc_enable(struct intel_crtc_state *pipe_config,intel_enable_pipe (intel_crtc);if (intel_crtc->config->has_pch_encoder) -ironlake_pch_enable (intel_crtc); +ironlake_pch_enable (pipe_config);assert_vblank_disabled (crtc);drm_crtc_vblank_on (crtc);@@ -5393,7 +5395,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,intel_enable_pipe (intel_crtc);if (intel_crtc->config->has_pch_encoder) -lpt_pch_enable (intel_crtc); +lpt_pch_enable (pipe_config);if (intel_crtc_has_type (intel_crtc->config,INTEL_OUTPUT_DP_MST ))intel_ddi_set_vc_payload_alloc (crtc, true);Signature · 1 line
2.9.3
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 5/8 drm/i915: Pass pipe_config to fdi_link_train() functions
In reply to Ander Conselvan de OliveiraIt is preferred to pass pipe_config to functions instead of accessing crtc->config directly. Follow suit and pass pipe_config to the fdi link train functions.
--- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/intel_ddi.c | 9 +++++---- drivers/gpu/drm/i915/intel_display.c | 19 +++++++++++-------- drivers/gpu/drm/i915/intel_drv.h | 3 ++- 4 files changed, 20 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -669,7 +669,8 @@ struct drm_i915_display_funcs {struct intel_encoder *encoder, const struct drm_display_mode *adjusted_mode);void (*audio_codec_disable)(struct intel_encoder *encoder); -void (*fdi_link_train)(struct intel_crtc *crtc); +void (*fdi_link_train)(struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config);void (*init_clock_gating)(struct drm_i915_private *dev_priv); int (*queue_flip)(struct drm_device *dev, struct drm_crtc *crtc, struct drm_framebuffer *fb,
drivers/gpu/drm/i915/intel_ddi.c +5 -4
@@ -674,7 +674,8 @@ static uint32_t hsw_pll_to_ddi_pll_sel(struct intel_shared_dpll *pll)* DDI A (which is used for eDP) */ -void hsw_fdi_link_train (struct intel_crtc *crtc) +void hsw_fdi_link_train (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config) {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -700,7 +701,7 @@ void hsw_fdi_link_train(struct intel_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 | -FDI_DP_PORT_WIDTH (crtc->config->fdi_lanes); +FDI_DP_PORT_WIDTH (pipe_config->fdi_lanes);I915_WRITE (FDI_RX_CTL (PIPE_A ), rx_ctl_val);POSTING_READ (FDI_RX_CTL (PIPE_A ));udelay (220 );
@@ -710,7 +711,7 @@ void hsw_fdi_link_train(struct intel_crtc *crtc)I915_WRITE (FDI_RX_CTL (PIPE_A ), rx_ctl_val);/* Configure Port Clock Select */ - ddi_pll_sel =hsw_pll_to_ddi_pll_sel (crtc->config->shared_dpll); + ddi_pll_sel =hsw_pll_to_ddi_pll_sel (pipe_config->shared_dpll);I915_WRITE (PORT_CLK_SEL (PORT_E ), ddi_pll_sel);WARN_ON (ddi_pll_sel !=PORT_CLK_SEL_SPLL );
@@ -730,7 +731,7 @@ void hsw_fdi_link_train(struct intel_crtc *crtc)* port reversal bit */ I915_WRITE (DDI_BUF_CTL (PORT_E ),DDI_BUF_CTL_ENABLE | - ((crtc->config->fdi_lanes -1 ) <<1 ) | + ((pipe_config->fdi_lanes -1 ) <<1 ) |DDI_BUF_TRANS_SELECT (i /2 ));POSTING_READ (DDI_BUF_CTL (PORT_E ));
drivers/gpu/drm/i915/intel_display.c +11 -8
@@ -3689,7 +3689,8 @@ static void intel_fdi_normal_train(struct intel_crtc *crtc) }/* The FDI link training functions for ILK/Ibexpeak. */ -static void ironlake_fdi_link_train (struct intel_crtc *crtc) +static void ironlake_fdi_link_train (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config) {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -3714,7 +3715,7 @@ static void ironlake_fdi_link_train(struct intel_crtc *crtc) reg =FDI_TX_CTL (pipe); temp =I915_READ (reg); temp &= ~FDI_DP_PORT_WIDTH_MASK ; - temp |=FDI_DP_PORT_WIDTH (crtc->config->fdi_lanes); + temp |=FDI_DP_PORT_WIDTH (pipe_config->fdi_lanes); temp &= ~FDI_LINK_TRAIN_NONE ; temp |=FDI_LINK_TRAIN_PATTERN_1 ;I915_WRITE (reg, temp |FDI_TX_ENABLE );
@@ -3789,7 +3790,8 @@ static const int snb_b_fdi_train_param[] = { };/* The FDI link training functions for SNB/Cougarpoint. */ -static void gen6_fdi_link_train (struct intel_crtc *crtc) +static void gen6_fdi_link_train (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config) {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -3812,7 +3814,7 @@ static void gen6_fdi_link_train(struct intel_crtc *crtc) reg =FDI_TX_CTL (pipe); temp =I915_READ (reg); temp &= ~FDI_DP_PORT_WIDTH_MASK ; - temp |=FDI_DP_PORT_WIDTH (crtc->config->fdi_lanes); + temp |=FDI_DP_PORT_WIDTH (pipe_config->fdi_lanes); temp &= ~FDI_LINK_TRAIN_NONE ; temp |=FDI_LINK_TRAIN_PATTERN_1 ; temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK ;
@@ -3921,7 +3923,8 @@ static void gen6_fdi_link_train(struct intel_crtc *crtc) }/* Manual link training for Ivy Bridge A0 parts */ -static void ivb_manual_fdi_link_train (struct intel_crtc *crtc) +static void ivb_manual_fdi_link_train (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config) {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -3963,7 +3966,7 @@ static void ivb_manual_fdi_link_train(struct intel_crtc *crtc) reg =FDI_TX_CTL (pipe); temp =I915_READ (reg); temp &= ~FDI_DP_PORT_WIDTH_MASK ; - temp |=FDI_DP_PORT_WIDTH (crtc->config->fdi_lanes); + temp |=FDI_DP_PORT_WIDTH (pipe_config->fdi_lanes); temp |=FDI_LINK_TRAIN_PATTERN_1_IVB ; temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK ; temp |= snb_b_fdi_train_param[j/2 ];
@@ -4475,7 +4478,7 @@ static void ironlake_pch_enable(struct intel_crtc *crtc, I915_READ(PIPE_DATA_M1(pipe)) & TU_SIZE_MASK);/* For PCH output, training FDI link */ - dev_priv->display.fdi_link_train (crtc); + dev_priv->display.fdi_link_train (crtc, pipe_config);/* We need to program the right clock selection before writing the pixel * mutliplier into the DPLL. */
@@ -5367,7 +5370,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,intel_encoders_pre_enable (crtc, pipe_config, old_state);if (intel_crtc->config->has_pch_encoder) - dev_priv->display.fdi_link_train (intel_crtc); + dev_priv->display.fdi_link_train (intel_crtc, pipe_config);if (!transcoder_is_dsi (cpu_transcoder))intel_ddi_enable_pipe_clock (intel_crtc);
drivers/gpu/drm/i915/intel_drv.h +2 -1
@@ -1225,7 +1225,8 @@ void intel_ddi_fdi_post_disable(struct intel_encoder *intel_encoder,struct intel_crtc_state *old_crtc_state, struct drm_connector_state *old_conn_state);void intel_prepare_dp_ddi_buffers (struct intel_encoder *encoder); -void hsw_fdi_link_train (struct intel_crtc *crtc); +void hsw_fdi_link_train (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config);void intel_ddi_init (struct drm_i915_private *dev_priv,enum port port);enum port intel_ddi_get_encoder_port (struct intel_encoder *intel_encoder);bool intel_ddi_get_hw_state (struct intel_encoder *encoder,enum pipe *pipe);
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915: Pass pipe_config to fdi_link_train() functions
It is preferred to pass pipe_config to functions instead of accessing crtc->config directly. Follow suit and pass pipe_config to the fdi link train functions.
v2: Add const; s/pipe_config/crtc_state/ (Ville)
--- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/intel_ddi.c | 9 +++++---- drivers/gpu/drm/i915/intel_display.c | 19 +++++++++++-------- drivers/gpu/drm/i915/intel_drv.h | 3 ++- 4 files changed, 20 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -669,7 +669,8 @@ struct drm_i915_display_funcs {struct intel_encoder *encoder, const struct drm_display_mode *adjusted_mode);void (*audio_codec_disable)(struct intel_encoder *encoder); -void (*fdi_link_train)(struct intel_crtc *crtc); +void (*fdi_link_train)(struct intel_crtc *crtc, +const struct intel_crtc_state *crtc_state);void (*init_clock_gating)(struct drm_i915_private *dev_priv); int (*queue_flip)(struct drm_device *dev, struct drm_crtc *crtc, struct drm_framebuffer *fb,
drivers/gpu/drm/i915/intel_ddi.c +5 -4
@@ -674,7 +674,8 @@ static uint32_t hsw_pll_to_ddi_pll_sel(struct intel_shared_dpll *pll)* DDI A (which is used for eDP) */ -void hsw_fdi_link_train (struct intel_crtc *crtc) +void hsw_fdi_link_train (struct intel_crtc *crtc, +const struct intel_crtc_state *crtc_state) {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -700,7 +701,7 @@ void hsw_fdi_link_train(struct intel_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 | -FDI_DP_PORT_WIDTH (crtc->config->fdi_lanes); +FDI_DP_PORT_WIDTH (crtc_state->fdi_lanes);I915_WRITE (FDI_RX_CTL (PIPE_A ), rx_ctl_val);POSTING_READ (FDI_RX_CTL (PIPE_A ));udelay (220 );
@@ -710,7 +711,7 @@ void hsw_fdi_link_train(struct intel_crtc *crtc)I915_WRITE (FDI_RX_CTL (PIPE_A ), rx_ctl_val);/* Configure Port Clock Select */ - ddi_pll_sel =hsw_pll_to_ddi_pll_sel (crtc->config->shared_dpll); + ddi_pll_sel =hsw_pll_to_ddi_pll_sel (crtc_state->shared_dpll);I915_WRITE (PORT_CLK_SEL (PORT_E ), ddi_pll_sel);WARN_ON (ddi_pll_sel !=PORT_CLK_SEL_SPLL );
@@ -730,7 +731,7 @@ void hsw_fdi_link_train(struct intel_crtc *crtc)* port reversal bit */ I915_WRITE (DDI_BUF_CTL (PORT_E ),DDI_BUF_CTL_ENABLE | - ((crtc->config->fdi_lanes -1 ) <<1 ) | + ((crtc_state->fdi_lanes -1 ) <<1 ) |DDI_BUF_TRANS_SELECT (i /2 ));POSTING_READ (DDI_BUF_CTL (PORT_E ));
drivers/gpu/drm/i915/intel_display.c +11 -8
@@ -3689,7 +3689,8 @@ static void intel_fdi_normal_train(struct intel_crtc *crtc) }/* The FDI link training functions for ILK/Ibexpeak. */ -static void ironlake_fdi_link_train (struct intel_crtc *crtc) +static void ironlake_fdi_link_train (struct intel_crtc *crtc, +const struct intel_crtc_state *crtc_state) {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -3714,7 +3715,7 @@ static void ironlake_fdi_link_train(struct intel_crtc *crtc) reg =FDI_TX_CTL (pipe); temp =I915_READ (reg); temp &= ~FDI_DP_PORT_WIDTH_MASK ; - temp |=FDI_DP_PORT_WIDTH (crtc->config->fdi_lanes); + temp |=FDI_DP_PORT_WIDTH (crtc_state->fdi_lanes); temp &= ~FDI_LINK_TRAIN_NONE ; temp |=FDI_LINK_TRAIN_PATTERN_1 ;I915_WRITE (reg, temp |FDI_TX_ENABLE );
@@ -3789,7 +3790,8 @@ static const int snb_b_fdi_train_param[] = { };/* The FDI link training functions for SNB/Cougarpoint. */ -static void gen6_fdi_link_train (struct intel_crtc *crtc) +static void gen6_fdi_link_train (struct intel_crtc *crtc, +const struct intel_crtc_state *crtc_state) {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -3812,7 +3814,7 @@ static void gen6_fdi_link_train(struct intel_crtc *crtc) reg =FDI_TX_CTL (pipe); temp =I915_READ (reg); temp &= ~FDI_DP_PORT_WIDTH_MASK ; - temp |=FDI_DP_PORT_WIDTH (crtc->config->fdi_lanes); + temp |=FDI_DP_PORT_WIDTH (crtc_state->fdi_lanes); temp &= ~FDI_LINK_TRAIN_NONE ; temp |=FDI_LINK_TRAIN_PATTERN_1 ; temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK ;
@@ -3921,7 +3923,8 @@ static void gen6_fdi_link_train(struct intel_crtc *crtc) }/* Manual link training for Ivy Bridge A0 parts */ -static void ivb_manual_fdi_link_train (struct intel_crtc *crtc) +static void ivb_manual_fdi_link_train (struct intel_crtc *crtc, +const struct intel_crtc_state *crtc_state) {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -3963,7 +3966,7 @@ static void ivb_manual_fdi_link_train(struct intel_crtc *crtc) reg =FDI_TX_CTL (pipe); temp =I915_READ (reg); temp &= ~FDI_DP_PORT_WIDTH_MASK ; - temp |=FDI_DP_PORT_WIDTH (crtc->config->fdi_lanes); + temp |=FDI_DP_PORT_WIDTH (crtc_state->fdi_lanes); temp |=FDI_LINK_TRAIN_PATTERN_1_IVB ; temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK ; temp |= snb_b_fdi_train_param[j/2 ];
@@ -4475,7 +4478,7 @@ static void ironlake_pch_enable(const struct intel_crtc_state *crtc_state) I915_READ(PIPE_DATA_M1(pipe)) & TU_SIZE_MASK);/* For PCH output, training FDI link */ - dev_priv->display.fdi_link_train (crtc); + dev_priv->display.fdi_link_train (crtc, crtc_state);/* We need to program the right clock selection before writing the pixel * mutliplier into the DPLL. */
@@ -5367,7 +5370,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,intel_encoders_pre_enable (crtc, pipe_config, old_state);if (intel_crtc->config->has_pch_encoder) - dev_priv->display.fdi_link_train (intel_crtc); + dev_priv->display.fdi_link_train (intel_crtc, pipe_config);if (!transcoder_is_dsi (cpu_transcoder))intel_ddi_enable_pipe_clock (intel_crtc);
drivers/gpu/drm/i915/intel_drv.h +2 -1
@@ -1225,7 +1225,8 @@ void intel_ddi_fdi_post_disable(struct intel_encoder *intel_encoder,struct intel_crtc_state *old_crtc_state, struct drm_connector_state *old_conn_state);void intel_prepare_dp_ddi_buffers (struct intel_encoder *encoder); -void hsw_fdi_link_train (struct intel_crtc *crtc); +void hsw_fdi_link_train (struct intel_crtc *crtc, +const struct intel_crtc_state *crtc_state);void intel_ddi_init (struct drm_i915_private *dev_priv,enum port port);enum port intel_ddi_get_encoder_port (struct intel_encoder *intel_encoder);bool intel_ddi_get_hw_state (struct intel_encoder *encoder,enum pipe *pipe);
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 6/8 drm/i915: Pass intel_crtc to DDI functions called from crtc en/disable
In reply to Ander Conselvan de OliveiraPass intel_crtc to functions intel_ddi_enable_transcoder_func(), intel_ddi_set_pipe_settings() and intel_ddi_set_vc_payload_alloc(), instead of the generic crtc type. By changing the functions intel_ddi_get_crtc_encoder() so that it receives an intel_crtc parameter, there is no need for the drm_crtc in the callers.
--- drivers/gpu/drm/i915/intel_ddi.c | 62 ++++++++++++++++-------------------- drivers/gpu/drm/i915/intel_display.c | 8 ++--- drivers/gpu/drm/i915/intel_drv.h | 6 ++-- 3 files changed, 34 insertions(+), 42 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +27 -35
@@ -818,21 +818,20 @@ void intel_ddi_init_dp_buf_reg(struct intel_encoder *encoder) }static struct intel_encoder * -intel_ddi_get_crtc_encoder (struct drm_crtc *crtc) +intel_ddi_get_crtc_encoder (struct intel_crtc *crtc) { -struct drm_device *dev = crtc->dev; -struct intel_crtc *intel_crtc =to_intel_crtc (crtc); +struct drm_device *dev = crtc->base.dev;struct intel_encoder *intel_encoder, *ret =NULL ;int num_encoders =0 ; -for_each_encoder_on_crtc (dev, crtc, intel_encoder) { +for_each_encoder_on_crtc (dev, &crtc->base, intel_encoder) { ret = intel_encoder; num_encoders++; }if (num_encoders !=1 )WARN (1 ,"%d encoders on crtc for pipe %c\n" , num_encoders, -pipe_name (intel_crtc->pipe)); +pipe_name (crtc->pipe));BUG_ON (ret ==NULL );return ret;
@@ -1194,12 +1193,11 @@ bool intel_ddi_pll_select(struct intel_crtc *intel_crtc, intel_encoder); } -void intel_ddi_set_pipe_settings (struct drm_crtc *crtc) +void intel_ddi_set_pipe_settings (struct intel_crtc *crtc) { -struct drm_i915_private *dev_priv =to_i915 (crtc->dev); -struct intel_crtc *intel_crtc =to_intel_crtc (crtc); +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_encoder *intel_encoder =intel_ddi_get_crtc_encoder (crtc); -enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder; +enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;int type = intel_encoder->type;uint32_t temp;
@@ -1207,7 +1205,7 @@ void intel_ddi_set_pipe_settings(struct drm_crtc *crtc)WARN_ON (transcoder_is_dsi (cpu_transcoder)); temp =TRANS_MSA_SYNC_CLK ; -switch (intel_crtc->config->pipe_bpp) { +switch (crtc->config->pipe_bpp) {case 18 : temp |=TRANS_MSA_6_BPC ;break ;
@@ -1227,12 +1225,10 @@ void intel_ddi_set_pipe_settings(struct drm_crtc *crtc) } } -void intel_ddi_set_vc_payload_alloc (struct drm_crtc *crtc,bool state) +void intel_ddi_set_vc_payload_alloc (struct intel_crtc *crtc,bool state) { -struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -struct drm_device *dev = crtc->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder; +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;uint32_t temp; temp =I915_READ (TRANS_DDI_FUNC_CTL (cpu_transcoder));if (state == true)
@@ -1242,14 +1238,12 @@ void intel_ddi_set_vc_payload_alloc(struct drm_crtc *crtc, bool state)I915_WRITE (TRANS_DDI_FUNC_CTL (cpu_transcoder), temp); } -void intel_ddi_enable_transcoder_func (struct drm_crtc *crtc) +void intel_ddi_enable_transcoder_func (struct intel_crtc *crtc) { -struct intel_crtc *intel_crtc =to_intel_crtc (crtc);struct intel_encoder *intel_encoder =intel_ddi_get_crtc_encoder (crtc); -struct drm_device *dev = crtc->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -enum pipe pipe = intel_crtc->pipe; -enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder; +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +enum pipe pipe = crtc->pipe; +enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;enum port port =intel_ddi_get_encoder_port (intel_encoder);int type = intel_encoder->type;uint32_t temp;
@@ -1258,7 +1252,7 @@ void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc) temp =TRANS_DDI_FUNC_ENABLE ; temp |=TRANS_DDI_SELECT_PORT (port); -switch (intel_crtc->config->pipe_bpp) { +switch (crtc->config->pipe_bpp) {case 18 : temp |=TRANS_DDI_BPC_6 ;break ;
@@ -1275,9 +1269,9 @@ void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc)BUG (); } -if (intel_crtc->config->base.adjusted_mode.flags &DRM_MODE_FLAG_PVSYNC ) +if (crtc->config->base.adjusted_mode.flags &DRM_MODE_FLAG_PVSYNC ) temp |=TRANS_DDI_PVSYNC ; -if (intel_crtc->config->base.adjusted_mode.flags &DRM_MODE_FLAG_PHSYNC ) +if (crtc->config->base.adjusted_mode.flags &DRM_MODE_FLAG_PHSYNC ) temp |=TRANS_DDI_PHSYNC ;if (cpu_transcoder ==TRANSCODER_EDP ) {
@@ -1288,8 +1282,8 @@ void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc)* using motion blur mitigation (which we don't * support). */ if (IS_HASWELL (dev_priv) && - (intel_crtc->config->pch_pfit.enabled || - intel_crtc->config->pch_pfit.force_thru)) + (crtc->config->pch_pfit.enabled || + crtc->config->pch_pfit.force_thru)) temp |=TRANS_DDI_EDP_INPUT_A_ONOFF ;else temp |=TRANS_DDI_EDP_INPUT_A_ON ;
@@ -1307,20 +1301,20 @@ void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc) }if (type ==INTEL_OUTPUT_HDMI ) { -if (intel_crtc->config->has_hdmi_sink) +if (crtc->config->has_hdmi_sink) temp |=TRANS_DDI_MODE_SELECT_HDMI ;else temp |=TRANS_DDI_MODE_SELECT_DVI ; }else if (type ==INTEL_OUTPUT_ANALOG ) { temp |=TRANS_DDI_MODE_SELECT_FDI ; - temp |= (intel_crtc->config->fdi_lanes -1 ) <<1 ; + temp |= (crtc->config->fdi_lanes -1 ) <<1 ; }else if (type ==INTEL_OUTPUT_DP || type ==INTEL_OUTPUT_EDP ) { temp |=TRANS_DDI_MODE_SELECT_DP_SST ; - temp |=DDI_PORT_WIDTH (intel_crtc->config->lane_count); + temp |=DDI_PORT_WIDTH (crtc->config->lane_count); }else if (type ==INTEL_OUTPUT_DP_MST ) { temp |=TRANS_DDI_MODE_SELECT_DP_MST ; - temp |=DDI_PORT_WIDTH (intel_crtc->config->lane_count); + temp |=DDI_PORT_WIDTH (crtc->config->lane_count); }else {WARN (1 ,"Invalid encoder type %d for pipe %c\n" , intel_encoder->type,pipe_name (pipe));
@@ -1484,14 +1478,12 @@ static u64 intel_ddi_get_power_domains(struct intel_encoder *encoder)return 0 ; } -void intel_ddi_enable_pipe_clock (struct intel_crtc *intel_crtc) +void intel_ddi_enable_pipe_clock (struct intel_crtc *crtc) { -struct drm_crtc *crtc = &intel_crtc->base; -struct drm_device *dev = crtc->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_encoder *intel_encoder =intel_ddi_get_crtc_encoder (crtc);enum port port =intel_ddi_get_encoder_port (intel_encoder); -enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder; +enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;if (cpu_transcoder !=TRANSCODER_EDP ) I915_WRITE(TRANS_CLK_SEL(cpu_transcoder),
drivers/gpu/drm/i915/intel_display.c +4 -4
@@ -5386,9 +5386,9 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,*/ intel_color_load_luts (&pipe_config->base); -intel_ddi_set_pipe_settings (crtc); +intel_ddi_set_pipe_settings (intel_crtc);if (!transcoder_is_dsi (cpu_transcoder)) -intel_ddi_enable_transcoder_func (crtc); +intel_ddi_enable_transcoder_func (intel_crtc);if (dev_priv->display.initial_watermarks !=NULL ) dev_priv->display.initial_watermarks (old_intel_state, pipe_config);
@@ -5401,7 +5401,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,lpt_pch_enable (intel_crtc, pipe_config);if (intel_crtc_has_type (intel_crtc->config,INTEL_OUTPUT_DP_MST )) -intel_ddi_set_vc_payload_alloc (crtc, true); +intel_ddi_set_vc_payload_alloc (intel_crtc, true);assert_vblank_disabled (crtc);drm_crtc_vblank_on (crtc);
@@ -5523,7 +5523,7 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,intel_disable_pipe (intel_crtc);if (intel_crtc_has_type (intel_crtc->config,INTEL_OUTPUT_DP_MST )) -intel_ddi_set_vc_payload_alloc (crtc, false); +intel_ddi_set_vc_payload_alloc (intel_crtc, false);if (!transcoder_is_dsi (cpu_transcoder))intel_ddi_disable_transcoder_func (dev_priv, cpu_transcoder);
drivers/gpu/drm/i915/intel_drv.h +3 -3
@@ -1230,14 +1230,14 @@ void hsw_fdi_link_train(struct intel_crtc *crtc,void intel_ddi_init (struct drm_i915_private *dev_priv,enum port port);enum port intel_ddi_get_encoder_port (struct intel_encoder *intel_encoder);bool intel_ddi_get_hw_state (struct intel_encoder *encoder,enum pipe *pipe); -void intel_ddi_enable_transcoder_func (struct drm_crtc *crtc); +void intel_ddi_enable_transcoder_func (struct intel_crtc *crtc);void intel_ddi_disable_transcoder_func (struct drm_i915_private *dev_priv,enum transcoder cpu_transcoder);void intel_ddi_enable_pipe_clock (struct intel_crtc *intel_crtc);void intel_ddi_disable_pipe_clock (struct intel_crtc *intel_crtc);bool intel_ddi_pll_select (struct intel_crtc *crtc,struct intel_crtc_state *crtc_state); -void intel_ddi_set_pipe_settings (struct drm_crtc *crtc); +void intel_ddi_set_pipe_settings (struct intel_crtc *crtc);void intel_ddi_prepare_link_retrain (struct intel_dp *intel_dp);bool intel_ddi_connector_get_hw_state (struct intel_connector *intel_connector); bool intel_ddi_is_audio_enabled(struct drm_i915_private *dev_priv,
@@ -1250,7 +1250,7 @@ intel_ddi_get_crtc_new_encoder(struct intel_crtc_state *crtc_state);void intel_ddi_init_dp_buf_reg (struct intel_encoder *encoder);void intel_ddi_clock_get (struct intel_encoder *encoder,struct intel_crtc_state *pipe_config); -void intel_ddi_set_vc_payload_alloc (struct drm_crtc *crtc,bool state); +void intel_ddi_set_vc_payload_alloc (struct intel_crtc *crtc,bool state);uint32_t ddi_signal_levels (struct intel_dp *intel_dp);u8 intel_ddi_dp_voltage_max (struct intel_encoder *encoder);
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 7/8 drm/i915: Remove direct usages of intel_crtc->config from DDI code
In reply to Ander Conselvan de OliveiraRemove direct usages of intel_crtc->config from the DDI code. Functions that didn't yet take a pipe_config as an argument were coverted to do so.
--- drivers/gpu/drm/i915/intel_ddi.c | 61 +++++++++++++++++++----------------- drivers/gpu/drm/i915/intel_display.c | 12 +++---- drivers/gpu/drm/i915/intel_drv.h | 16 +++++++--- 3 files changed, 49 insertions(+), 40 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +32 -29
@@ -1193,11 +1193,12 @@ bool intel_ddi_pll_select(struct intel_crtc *intel_crtc, intel_encoder); } -void intel_ddi_set_pipe_settings (struct intel_crtc *crtc) +void intel_ddi_set_pipe_settings (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config) {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_encoder *intel_encoder =intel_ddi_get_crtc_encoder (crtc); -enum transcoder cpu_transcoder = crtc->config->cpu_transcoder; +enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;int type = intel_encoder->type;uint32_t temp;
@@ -1205,7 +1206,7 @@ void intel_ddi_set_pipe_settings(struct intel_crtc *crtc)WARN_ON (transcoder_is_dsi (cpu_transcoder)); temp =TRANS_MSA_SYNC_CLK ; -switch (crtc->config->pipe_bpp) { +switch (pipe_config->pipe_bpp) {case 18 : temp |=TRANS_MSA_6_BPC ;break ;
@@ -1225,10 +1226,12 @@ void intel_ddi_set_pipe_settings(struct intel_crtc *crtc) } } -void intel_ddi_set_vc_payload_alloc (struct intel_crtc *crtc,bool state) +void intel_ddi_set_vc_payload_alloc (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config, +bool state) {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -enum transcoder cpu_transcoder = crtc->config->cpu_transcoder; +enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;uint32_t temp; temp =I915_READ (TRANS_DDI_FUNC_CTL (cpu_transcoder));if (state == true)
@@ -1238,12 +1241,13 @@ void intel_ddi_set_vc_payload_alloc(struct intel_crtc *crtc, bool state)I915_WRITE (TRANS_DDI_FUNC_CTL (cpu_transcoder), temp); } -void intel_ddi_enable_transcoder_func (struct intel_crtc *crtc) +void intel_ddi_enable_transcoder_func (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config) {struct intel_encoder *intel_encoder =intel_ddi_get_crtc_encoder (crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe; -enum transcoder cpu_transcoder = crtc->config->cpu_transcoder; +enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;enum port port =intel_ddi_get_encoder_port (intel_encoder);int type = intel_encoder->type;uint32_t temp;
@@ -1252,7 +1256,7 @@ void intel_ddi_enable_transcoder_func(struct intel_crtc *crtc) temp =TRANS_DDI_FUNC_ENABLE ; temp |=TRANS_DDI_SELECT_PORT (port); -switch (crtc->config->pipe_bpp) { +switch (pipe_config->pipe_bpp) {case 18 : temp |=TRANS_DDI_BPC_6 ;break ;
@@ -1269,9 +1273,9 @@ void intel_ddi_enable_transcoder_func(struct intel_crtc *crtc)BUG (); } -if (crtc->config->base.adjusted_mode.flags &DRM_MODE_FLAG_PVSYNC ) +if (pipe_config->base.adjusted_mode.flags &DRM_MODE_FLAG_PVSYNC ) temp |=TRANS_DDI_PVSYNC ; -if (crtc->config->base.adjusted_mode.flags &DRM_MODE_FLAG_PHSYNC ) +if (pipe_config->base.adjusted_mode.flags &DRM_MODE_FLAG_PHSYNC ) temp |=TRANS_DDI_PHSYNC ;if (cpu_transcoder ==TRANSCODER_EDP ) {
@@ -1282,8 +1286,8 @@ void intel_ddi_enable_transcoder_func(struct intel_crtc *crtc)* using motion blur mitigation (which we don't * support). */ if (IS_HASWELL (dev_priv) && - (crtc->config->pch_pfit.enabled || - crtc->config->pch_pfit.force_thru)) + (pipe_config->pch_pfit.enabled || + pipe_config->pch_pfit.force_thru)) temp |=TRANS_DDI_EDP_INPUT_A_ONOFF ;else temp |=TRANS_DDI_EDP_INPUT_A_ON ;
@@ -1301,20 +1305,20 @@ void intel_ddi_enable_transcoder_func(struct intel_crtc *crtc) }if (type ==INTEL_OUTPUT_HDMI ) { -if (crtc->config->has_hdmi_sink) +if (pipe_config->has_hdmi_sink) temp |=TRANS_DDI_MODE_SELECT_HDMI ;else temp |=TRANS_DDI_MODE_SELECT_DVI ; }else if (type ==INTEL_OUTPUT_ANALOG ) { temp |=TRANS_DDI_MODE_SELECT_FDI ; - temp |= (crtc->config->fdi_lanes -1 ) <<1 ; + temp |= (pipe_config->fdi_lanes -1 ) <<1 ; }else if (type ==INTEL_OUTPUT_DP || type ==INTEL_OUTPUT_EDP ) { temp |=TRANS_DDI_MODE_SELECT_DP_SST ; - temp |=DDI_PORT_WIDTH (crtc->config->lane_count); + temp |=DDI_PORT_WIDTH (pipe_config->lane_count); }else if (type ==INTEL_OUTPUT_DP_MST ) { temp |=TRANS_DDI_MODE_SELECT_DP_MST ; - temp |=DDI_PORT_WIDTH (crtc->config->lane_count); + temp |=DDI_PORT_WIDTH (pipe_config->lane_count); }else {WARN (1 ,"Invalid encoder type %d for pipe %c\n" , intel_encoder->type,pipe_name (pipe));
@@ -1478,22 +1482,24 @@ static u64 intel_ddi_get_power_domains(struct intel_encoder *encoder)return 0 ; } -void intel_ddi_enable_pipe_clock (struct intel_crtc *crtc) +void intel_ddi_enable_pipe_clock (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config) {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_encoder *intel_encoder =intel_ddi_get_crtc_encoder (crtc);enum port port =intel_ddi_get_encoder_port (intel_encoder); -enum transcoder cpu_transcoder = crtc->config->cpu_transcoder; +enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;if (cpu_transcoder !=TRANSCODER_EDP )I915_WRITE (TRANS_CLK_SEL (cpu_transcoder),TRANS_CLK_SEL_PORT (port)); } -void intel_ddi_disable_pipe_clock (struct intel_crtc *intel_crtc) +void intel_ddi_disable_pipe_clock (struct intel_crtc *intel_crtc, +struct intel_crtc_state *pipe_config) {struct drm_i915_private *dev_priv =to_i915 (intel_crtc->base.dev); -enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder; +enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;if (cpu_transcoder !=TRANSCODER_EDP ) I915_WRITE(TRANS_CLK_SEL(cpu_transcoder),
@@ -1759,23 +1765,21 @@ static void intel_ddi_pre_enable(struct intel_encoder *intel_encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { - struct drm_encoder *encoder = &intel_encoder->base; -struct intel_crtc *crtc =to_intel_crtc (encoder->crtc); int type = intel_encoder->type;if (type ==INTEL_OUTPUT_DP || type ==INTEL_OUTPUT_EDP ) {intel_ddi_pre_enable_dp (intel_encoder, - crtc->config->port_clock, - crtc->config->lane_count, - crtc->config->shared_dpll, -intel_crtc_has_type (crtc->config, + pipe_config->port_clock, + pipe_config->lane_count, + pipe_config->shared_dpll, +intel_crtc_has_type (pipe_config,INTEL_OUTPUT_DP_MST )); }if (type ==INTEL_OUTPUT_HDMI ) {intel_ddi_pre_enable_hdmi (intel_encoder, pipe_config->has_hdmi_sink, pipe_config, conn_state, - crtc->config->shared_dpll); + pipe_config->shared_dpll); } }
@@ -1922,8 +1926,7 @@ static void bxt_ddi_pre_pll_enable(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { - struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); -uint8_t mask = intel_crtc->config->lane_lat_optim_mask; + uint8_t mask = pipe_config->lane_lat_optim_mask;bxt_ddi_phy_set_lane_optim_mask (encoder, mask); }
drivers/gpu/drm/i915/intel_display.c +6 -6
@@ -5373,7 +5373,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config, dev_priv->display.fdi_link_train (intel_crtc, pipe_config);if (!transcoder_is_dsi (cpu_transcoder)) -intel_ddi_enable_pipe_clock (intel_crtc); +intel_ddi_enable_pipe_clock (intel_crtc, pipe_config);if (INTEL_GEN (dev_priv) >=9 )skylake_pfit_enable (intel_crtc);
@@ -5386,9 +5386,9 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,*/ intel_color_load_luts (&pipe_config->base); -intel_ddi_set_pipe_settings (intel_crtc); +intel_ddi_set_pipe_settings (intel_crtc, pipe_config);if (!transcoder_is_dsi (cpu_transcoder)) -intel_ddi_enable_transcoder_func (intel_crtc); +intel_ddi_enable_transcoder_func (intel_crtc, pipe_config);if (dev_priv->display.initial_watermarks !=NULL ) dev_priv->display.initial_watermarks (old_intel_state, pipe_config);
@@ -5401,7 +5401,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,lpt_pch_enable (intel_crtc, pipe_config);if (intel_crtc_has_type (intel_crtc->config,INTEL_OUTPUT_DP_MST )) -intel_ddi_set_vc_payload_alloc (intel_crtc, true); +intel_ddi_set_vc_payload_alloc (intel_crtc, pipe_config, true);assert_vblank_disabled (crtc);drm_crtc_vblank_on (crtc);
@@ -5523,7 +5523,7 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,intel_disable_pipe (intel_crtc);if (intel_crtc_has_type (intel_crtc->config,INTEL_OUTPUT_DP_MST )) -intel_ddi_set_vc_payload_alloc (intel_crtc, false); +intel_ddi_set_vc_payload_alloc (intel_crtc, intel_crtc->config, false);if (!transcoder_is_dsi (cpu_transcoder))intel_ddi_disable_transcoder_func (dev_priv, cpu_transcoder);
@@ -5534,7 +5534,7 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,ironlake_pfit_disable (intel_crtc, false);if (!transcoder_is_dsi (cpu_transcoder)) -intel_ddi_disable_pipe_clock (intel_crtc); +intel_ddi_disable_pipe_clock (intel_crtc, intel_crtc->config);intel_encoders_post_disable (crtc, old_crtc_state, old_state);
drivers/gpu/drm/i915/intel_drv.h +11 -5
@@ -1230,14 +1230,18 @@ void hsw_fdi_link_train(struct intel_crtc *crtc,void intel_ddi_init (struct drm_i915_private *dev_priv,enum port port);enum port intel_ddi_get_encoder_port (struct intel_encoder *intel_encoder);bool intel_ddi_get_hw_state (struct intel_encoder *encoder,enum pipe *pipe); -void intel_ddi_enable_transcoder_func (struct intel_crtc *crtc); +void intel_ddi_enable_transcoder_func (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config);void intel_ddi_disable_transcoder_func (struct drm_i915_private *dev_priv,enum transcoder cpu_transcoder); -void intel_ddi_enable_pipe_clock (struct intel_crtc *intel_crtc); -void intel_ddi_disable_pipe_clock (struct intel_crtc *intel_crtc); +void intel_ddi_enable_pipe_clock (struct intel_crtc *intel_crtc, +struct intel_crtc_state *pipe_config); +void intel_ddi_disable_pipe_clock (struct intel_crtc *intel_crtc, +struct intel_crtc_state *pipe_config);bool intel_ddi_pll_select (struct intel_crtc *crtc,struct intel_crtc_state *crtc_state); -void intel_ddi_set_pipe_settings (struct intel_crtc *crtc); +void intel_ddi_set_pipe_settings (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config);void intel_ddi_prepare_link_retrain (struct intel_dp *intel_dp);bool intel_ddi_connector_get_hw_state (struct intel_connector *intel_connector); bool intel_ddi_is_audio_enabled(struct drm_i915_private *dev_priv,
@@ -1250,7 +1254,9 @@ intel_ddi_get_crtc_new_encoder(struct intel_crtc_state *crtc_state);void intel_ddi_init_dp_buf_reg (struct intel_encoder *encoder);void intel_ddi_clock_get (struct intel_encoder *encoder,struct intel_crtc_state *pipe_config); -void intel_ddi_set_vc_payload_alloc (struct intel_crtc *crtc,bool state); +void intel_ddi_set_vc_payload_alloc (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config, +bool state);uint32_t ddi_signal_levels (struct intel_dp *intel_dp);u8 intel_ddi_dp_voltage_max (struct intel_encoder *encoder);
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 8/8 drm/i915: Remove duplicate DDI enabling logic from MST path
In reply to Ander Conselvan de OliveiraThe logic to enable a DDI in intel_mst_pre_enable_dp() is essentially the same as in intel_ddi_pre_enable_dp(). So reuse the latter function by calling the post_disable hook on the intel_dig_port instead of duplicating that code.
v2: Don't oops because of a NULL encoder->crtc. (Ville)
--- drivers/gpu/drm/i915/intel_ddi.c | 2 ++ drivers/gpu/drm/i915/intel_dp_mst.c | 23 +++-------------------- 2 files changed, 5 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +2 -0
@@ -1714,6 +1714,8 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,enum port port =intel_ddi_get_encoder_port (encoder);struct intel_digital_port *dig_port =enc_to_dig_port (&encoder->base); +WARN_ON (link_mst && port ==PORT_A ); +intel_dp_set_link_params (intel_dp, link_rate, lane_count, link_mst);if (encoder->type ==INTEL_OUTPUT_EDP )
drivers/gpu/drm/i915/intel_dp_mst.c +3 -20
@@ -159,26 +159,9 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder,DRM_DEBUG_KMS ("%d\n" , intel_dp->active_mst_links); -if (intel_dp->active_mst_links ==0 ) { -intel_ddi_clk_select (&intel_dig_port->base, - pipe_config->shared_dpll); - -intel_display_power_get (dev_priv, - intel_dig_port->ddi_io_power_domain); - -intel_prepare_dp_ddi_buffers (&intel_dig_port->base); -intel_dp_set_link_params (intel_dp, - pipe_config->port_clock, - pipe_config->lane_count, - true); - -intel_ddi_init_dp_buf_reg (&intel_dig_port->base); - -intel_dp_sink_dpms (intel_dp,DRM_MODE_DPMS_ON ); - -intel_dp_start_link_train (intel_dp); -intel_dp_stop_link_train (intel_dp); - } +if (intel_dp->active_mst_links ==0 ) + intel_dig_port->base.pre_enable (&intel_dig_port->base, + pipe_config,NULL ); ret = drm_dp_mst_allocate_vcpi(&intel_dp->mst_mgr, connector->port,
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 8/8] drm/i915: Remove duplicate DDI enabling logic from MST path
Quoted 19 lines · Ander Conselvan de Oliveira
The logic to enable a DDI in
intel_mst_pre_enable_dp()is essentially the same as inintel_ddi_pre_enable_dp(). So reuse the latter function by calling thepost_disablehook on theintel_dig_portinstead of duplicating that code.v2: Don't oops because of a NULL
encoder->crtc. (Ville)Cc Imre Deak <[email protected]>Cc Ville Syrjälä <[email protected]>Signed-off-by Ander Conselvan de Oliveira <[email protected]>--- drivers/gpu/drm/i915/intel_ddi.c | 2 ++ drivers/gpu/drm/i915/intel_dp_mst.c | 23 +++-------------------- 2 files changed, 5 insertions(+), 20 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +0
-0
drivers/gpu/drm/i915/intel_ddi.c static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder, · line 1718
Quoted 5 lines
drivers/gpu/drm/i915/intel_ddi.c +2
-0@@ -1714,6 +1714,8 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,enum port port =intel_ddi_get_encoder_port (encoder);struct intel_digital_port *dig_port =enc_to_dig_port (&encoder->base); +WARN_ON (link_mst && port ==PORT_A ); +
MST isn't allowed on port E either IIRC, so might want to warn for that one as well.
Quoted 39 lines
drivers/gpu/drm/i915/intel_ddi.c +0
-0intel_dp_set_link_params (intel_dp, link_rate, lane_count, link_mst);if (encoder->type ==INTEL_OUTPUT_EDP )drivers/gpu/drm/i915/intel_dp_mst.c +3
-20@@ -159,26 +159,9 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder,DRM_DEBUG_KMS ("%d\n" , intel_dp->active_mst_links); -if (intel_dp->active_mst_links ==0 ) { -intel_ddi_clk_select (&intel_dig_port->base, - pipe_config->shared_dpll); - -intel_display_power_get (dev_priv, - intel_dig_port->ddi_io_power_domain); - -intel_prepare_dp_ddi_buffers (&intel_dig_port->base); -intel_dp_set_link_params (intel_dp, - pipe_config->port_clock, - pipe_config->lane_count, - true); - -intel_ddi_init_dp_buf_reg (&intel_dig_port->base); - -intel_dp_sink_dpms (intel_dp,DRM_MODE_DPMS_ON ); - -intel_dp_start_link_train (intel_dp); -intel_dp_stop_link_train (intel_dp); - } +if (intel_dp->active_mst_links ==0 ) + intel_dig_port->base.pre_enable (&intel_dig_port->base, + pipe_config,NULL ); ret = drm_dp_mst_allocate_vcpi(&intel_dp->mst_mgr, connector->port,Signature · 1 line
2.9.3
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 Try to fix MST regression with DDI IO power domains (rev2)
In reply to Ander Conselvan de Oliveira== Series Details ==
== Series Details ==
Series: Try to fix MST regression with DDI IO power domains (rev2)
URL : https://patchwork.freedesktop.org/series/20345/
State : success
== Summary ==
Series 20345v2 Try to fix MST regression with DDI IO power domains
https://patchwork.freedesktop.org/api/1.0/series/20345/revisions/2/mbox/
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 fi-bsw-n3050 total:278 pass:239 dwarn:0 dfail:0 fail:0 skip:39 fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 fi-byt-j1900 total:278 pass:251 dwarn:0 dfail:0 fail:0 skip:27 fi-byt-n2820 total:278 pass:247 dwarn:0 dfail:0 fail:0 skip:31 fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 fi-kbl-7500u total:278 pass:259 dwarn:1 dfail:0 fail:0 skip:18 fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29
77db4e1f75f54471bf2fbebf114b2ba9c2d3bca7 drm-tip: 2017y-03m-01d-14h-59m-18s UTC integration manifest b859863 drm/i915: Remove duplicate DDI enabling logic from MST path
881dbd6 drm/i915: Remove direct usages of intel_crtc->config from DDI code
16be05c drm/i915: Pass intel_crtc to DDI functions called from crtc en/disable aa0aa86 drm/i915: Pass pipe_config to fdi_link_train() functions
1f09668 drm/i915: Pass pipe_config to pch_enable() functions
ec11fe2 drm/i915: Pass intel_crtc to intel_lpt_pch_enable()
ccc54cd drm/i915: Pass intel_crtc to fdi_link_train() hooks
c371ce1 drm/i915: Enable DDI IO power domains in the DP MST path
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4016/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Try to fix MST regression with DDI IO power domains (rev4)
In reply to Ander Conselvan de Oliveira== Series Details ==
== Series Details ==
Series: Try to fix MST regression with DDI IO power domains (rev4)
URL : https://patchwork.freedesktop.org/series/20345/
State : success
== Summary ==
Series 20345v4 Try to fix MST regression with DDI IO power domains
https://patchwork.freedesktop.org/api/1.0/series/20345/revisions/4/mbox/
Test pm_rpm:
Subgroup basic-pci-d3-state:
incomplete -> PASS (fi-byt-n2820) fdo#99740fdo#99740 https://bugs.freedesktop.org/show_bug.cgi?id=99740
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 fi-bsw-n3050 total:278 pass:239 dwarn:0 dfail:0 fail:0 skip:39 fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 fi-byt-j1900 total:278 pass:251 dwarn:0 dfail:0 fail:0 skip:27 fi-byt-n2820 total:278 pass:247 dwarn:0 dfail:0 fail:0 skip:31 fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 fi-kbl-7500u total:278 pass:259 dwarn:1 dfail:0 fail:0 skip:18 fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29
b3c4a574937b2256a716b23037c8b94ffebd7c8a drm-tip: 2017y-03m-02d-08h-59m-08s UTC integration manifest 5566f2c drm/i915: Remove duplicate DDI enabling logic from MST path
ad66c98 drm/i915: Remove direct usages of intel_crtc->config from DDI code
e72d837 drm/i915: Pass intel_crtc to DDI functions called from crtc en/disable 13d0cc49 drm/i915: Pass pipe_config to fdi_link_train() functions
081a5d5 drm/i915: Pass pipe_config to pch_enable() functions
0190f31 drm/i915: Pass intel_crtc to intel_lpt_pch_enable()
1c19ed3 drm/i915: Pass intel_crtc to fdi_link_train() hooks
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4029/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx