drm/i915: handle DP_MST correctly in bxt_get_dpll
Subsystems (2)
PATCH 1/15 drm/i915: handle DP_MST correctly in bxt_get_dpll
No idea if it supports it, but this is the minimum required from get_dpll.
--- drivers/gpu/drm/i915/intel_dpll_mgr.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_dpll_mgr.c +8 -2
@@ -1535,7 +1535,8 @@ bxt_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state, vco = best_clock.vco; }else if (encoder->type ==INTEL_OUTPUT_DP || - encoder->type ==INTEL_OUTPUT_EDP ) { + encoder->type ==INTEL_OUTPUT_EDP || + encoder->type ==INTEL_OUTPUT_DP_MST ) {int i; clk_div = bxt_dp_clk_val[0 ];
@@ -1611,7 +1612,12 @@ bxt_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state, crtc_state->dpll_hw_state.pcsdw12 =LANESTAGGER_STRAP_OVRD | lanestagger; - intel_dig_port =enc_to_dig_port (&encoder->base); +if (encoder->type ==INTEL_OUTPUT_DP_MST ) { +struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base); + + intel_dig_port = intel_mst->primary; + }else + intel_dig_port =enc_to_dig_port (&encoder->base);/* 1:1 mapping between ports and PLLs */ i = (enum intel_dpll_id ) intel_dig_port->port;
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/15 drm/i915: Pass atomic state to crtc enable/disable functions
This is required for supporting nonblocking modesets. Iterating over the connector list will no longer be allowed when we don't hold connection_mutex, so we have to use the atomic state.
Fix disable_noatomic by populating the minimal state required to disable a connector.
--- drivers/gpu/drm/i915/i915_drv.h | 6 ++-- drivers/gpu/drm/i915/intel_display.c | 56 ++++++++++++++++++++++++------------ 2 files changed, 42 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +4 -2
@@ -626,8 +626,10 @@ struct drm_i915_display_funcs { struct intel_initial_plane_config *);int (*crtc_compute_clock)(struct intel_crtc *crtc,struct intel_crtc_state *crtc_state); -void (*crtc_enable)(struct drm_crtc *crtc); -void (*crtc_disable)(struct drm_crtc *crtc); +void (*crtc_enable)(struct intel_crtc_state *pipe_config, +struct drm_atomic_state *old_state); +void (*crtc_disable)(struct intel_crtc_state *old_crtc_state, +struct drm_atomic_state *old_state);void (*audio_codec_enable)(struct drm_connector *connector,struct intel_encoder *encoder,const struct drm_display_mode *adjusted_mode);
drivers/gpu/drm/i915/intel_display.c +38 -18
148 lines not on this page · raw message
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/15 drm/i915: Remove unused mode_set hook from encoder
In reply to Maarten Lankhorst--- drivers/gpu/drm/i915/intel_drv.h | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/i915/intel_drv.h +0 -1
@@ -198,7 +198,6 @@ struct intel_encoder {void (*pre_pll_enable)(struct intel_encoder *);void (*pre_enable)(struct intel_encoder *);void (*enable)(struct intel_encoder *); -void (*mode_set)(struct intel_encoder *intel_encoder);void (*disable)(struct intel_encoder *);void (*post_disable)(struct intel_encoder *);void (*post_pll_disable)(struct intel_encoder *);
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 03/15] drm/i915: Remove unused mode_set hook from encoder
Quoted 1 line · Maarten Lankhorst
Signed-off-by Maarten Lankhorst <[email protected]>
Quoted 23 lines
--- drivers/gpu/drm/i915/intel_drv.h | 1 - 1 file changed, 1 deletion(-)drivers/gpu/drm/i915/intel_drv.h +0
-1@@ -198,7 +198,6 @@ struct intel_encoder {void (*pre_pll_enable)(struct intel_encoder *);void (*pre_enable)(struct intel_encoder *);void (*enable)(struct intel_encoder *); -void (*mode_set)(struct intel_encoder *intel_encoder);void (*disable)(struct intel_encoder *);void (*post_disable)(struct intel_encoder *);void (*post_pll_disable)(struct intel_encoder *);Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/15 drm/i915: Walk over encoders in crtc enable/disable using atomic state.
In reply to Maarten LankhorstThis cleans up another possible use of the connector list, encoder->crtc is legacy state and should not be used.
With the atomic state as argument it's easy to find the encoder from the connector it belongs to.
intel_opregion_notify_encoder is a noop for !HAS_DDI, so it's harmless to unconditionally include it in encoder enable/disable.
--- drivers/gpu/drm/i915/intel_display.c | 190 ++++++++++++++++++++++++----------- 1 file changed, 134 insertions(+), 56 deletions(-)
drivers/gpu/drm/i915/intel_display.c +134 -56
@@ -4704,6 +4704,123 @@ static void intel_crtc_disable_planes(struct drm_crtc *crtc, unsigned plane_maskintel_frontbuffer_flip (dev,INTEL_FRONTBUFFER_ALL_MASK (pipe)); } +static void intel_encoders_pre_pll_enable (struct drm_crtc *crtc, +struct drm_atomic_state *old_state) +{ +struct drm_connector_state *old_conn_state; +struct drm_connector *conn; +int i; + +for_each_connector_in_state (old_state, conn, old_conn_state, i) { +struct drm_connector_state *conn_state = conn->state; +struct intel_encoder *encoder = +to_intel_encoder (conn_state->best_encoder); + +if (conn_state->crtc != crtc) +continue ; + +if (encoder->pre_pll_enable) + encoder->pre_pll_enable (encoder); + } +} + +static void intel_encoders_pre_enable (struct drm_crtc *crtc, +struct drm_atomic_state *old_state) +{ +struct drm_connector_state *old_conn_state; +struct drm_connector *conn; +int i; + +for_each_connector_in_state (old_state, conn, old_conn_state, i) { +struct drm_connector_state *conn_state = conn->state; +struct intel_encoder *encoder = +to_intel_encoder (conn_state->best_encoder); + +if (conn_state->crtc != crtc) +continue ; + +if (encoder->pre_enable) + encoder->pre_enable (encoder); + } +} + +static void intel_encoders_enable (struct drm_crtc *crtc, +struct drm_atomic_state *old_state) +{ +struct drm_connector_state *old_conn_state; +struct drm_connector *conn; +int i; + +for_each_connector_in_state (old_state, conn, old_conn_state, i) { +struct drm_connector_state *conn_state = conn->state; +struct intel_encoder *encoder = +to_intel_encoder (conn_state->best_encoder); + +if (conn_state->crtc != crtc) +continue ; + + encoder->enable (encoder); +intel_opregion_notify_encoder (encoder, true); + } +} + +static void intel_encoders_disable (struct drm_crtc *crtc, +struct drm_atomic_state *old_state) +{ +struct drm_connector_state *old_conn_state; +struct drm_connector *conn; +int i; + +for_each_connector_in_state (old_state, conn, old_conn_state, i) { +struct intel_encoder *encoder = +to_intel_encoder (old_conn_state->best_encoder); + +if (old_conn_state->crtc != crtc) +continue ; + +intel_opregion_notify_encoder (encoder, false); + encoder->disable (encoder); + } +} + +static void intel_encoders_post_disable (struct drm_crtc *crtc, +struct drm_atomic_state *old_state) +{ +struct drm_connector_state *old_conn_state; +struct drm_connector *conn; +int i; + +for_each_connector_in_state (old_state, conn, old_conn_state, i) { +struct intel_encoder *encoder = +to_intel_encoder (old_conn_state->best_encoder); + +if (old_conn_state->crtc != crtc) +continue ; + +if (encoder->post_disable) + encoder->post_disable (encoder); + } +} + +static void intel_encoders_post_pll_disable (struct drm_crtc *crtc, +struct drm_atomic_state *old_state) +{ +struct drm_connector_state *old_conn_state; +struct drm_connector *conn; +int i; + +for_each_connector_in_state (old_state, conn, old_conn_state, i) { +struct intel_encoder *encoder = +to_intel_encoder (old_conn_state->best_encoder); + +if (old_conn_state->crtc != crtc) +continue ; + +if (encoder->post_pll_disable) + encoder->post_pll_disable (encoder); + } +} +static void ironlake_crtc_enable (struct intel_crtc_state *pipe_config,struct drm_atomic_state *old_state) {
@@ -4711,7 +4828,6 @@ static void ironlake_crtc_enable(struct intel_crtc_state *pipe_config,struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -struct intel_encoder *encoder;int pipe = intel_crtc->pipe;if (WARN_ON (intel_crtc->active))
@@ -4750,9 +4866,7 @@ static void ironlake_crtc_enable(struct intel_crtc_state *pipe_config, intel_crtc->active = true; -for_each_encoder_on_crtc (dev, crtc, encoder) -if (encoder->pre_enable) - encoder->pre_enable (encoder); +intel_encoders_pre_enable (crtc, old_state);if (intel_crtc->config->has_pch_encoder) {/* Note: FDI PLL enabling _must_ be done before we enable the
@@ -4782,8 +4896,7 @@ static void ironlake_crtc_enable(struct intel_crtc_state *pipe_config,assert_vblank_disabled (crtc);drm_crtc_vblank_on (crtc); -for_each_encoder_on_crtc (dev, crtc, encoder) - encoder->enable (encoder); +intel_encoders_enable (crtc, old_state);if (HAS_PCH_CPT (dev))cpt_verify_modeset (dev, intel_crtc->pipe);
@@ -4808,7 +4921,6 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -struct intel_encoder *encoder;int pipe = intel_crtc->pipe, hsw_workaround_pipe;enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder;
@@ -4819,9 +4931,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,intel_set_pch_fifo_underrun_reporting (dev_priv,TRANSCODER_A , false); -for_each_encoder_on_crtc (dev, crtc, encoder) -if (encoder->pre_pll_enable) - encoder->pre_pll_enable (encoder); +intel_encoders_pre_pll_enable (crtc, old_state);if (intel_crtc->config->shared_dpll)intel_enable_shared_dpll (intel_crtc);
@@ -4859,10 +4969,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,else intel_set_cpu_fifo_underrun_reporting (dev_priv, pipe, true); -for_each_encoder_on_crtc (dev, crtc, encoder) { -if (encoder->pre_enable) - encoder->pre_enable (encoder); - } +intel_encoders_pre_enable (crtc, old_state);if (intel_crtc->config->has_pch_encoder) dev_priv->display.fdi_link_train (crtc);
@@ -4903,10 +5010,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,assert_vblank_disabled (crtc);drm_crtc_vblank_on (crtc); -for_each_encoder_on_crtc (dev, crtc, encoder) { - encoder->enable (encoder); -intel_opregion_notify_encoder (encoder, true); - } +intel_encoders_enable (crtc, old_state);if (intel_crtc->config->has_pch_encoder) {intel_wait_for_vblank (dev, pipe);
@@ -4947,7 +5051,6 @@ static void ironlake_crtc_disable(struct intel_crtc_state *old_crtc_state,struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -struct intel_encoder *encoder;int pipe = intel_crtc->pipe;/*
@@ -4960,8 +5063,7 @@ static void ironlake_crtc_disable(struct intel_crtc_state *old_crtc_state,intel_set_pch_fifo_underrun_reporting (dev_priv, pipe, false); } -for_each_encoder_on_crtc (dev, crtc, encoder) - encoder->disable (encoder); +intel_encoders_disable (crtc, old_state);drm_crtc_vblank_off (crtc);assert_vblank_disabled (crtc);
@@ -4973,9 +5075,7 @@ static void ironlake_crtc_disable(struct intel_crtc_state *old_crtc_state,if (intel_crtc->config->has_pch_encoder)ironlake_fdi_disable (crtc); -for_each_encoder_on_crtc (dev, crtc, encoder) -if (encoder->post_disable) - encoder->post_disable (encoder); +intel_encoders_post_disable (crtc, old_state);if (intel_crtc->config->has_pch_encoder) {ironlake_disable_pch_transcoder (dev_priv, pipe);
@@ -5012,17 +5112,13 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -struct intel_encoder *encoder;enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder;if (intel_crtc->config->has_pch_encoder)intel_set_pch_fifo_underrun_reporting (dev_priv,TRANSCODER_A , false); -for_each_encoder_on_crtc (dev, crtc, encoder) { -intel_opregion_notify_encoder (encoder, false); - encoder->disable (encoder); - } +intel_encoders_disable (crtc, old_state);drm_crtc_vblank_off (crtc);assert_vblank_disabled (crtc);
@@ -5045,9 +5141,7 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,if (!transcoder_is_dsi (cpu_transcoder))intel_ddi_disable_pipe_clock (intel_crtc); -for_each_encoder_on_crtc (dev, crtc, encoder) -if (encoder->post_disable) - encoder->post_disable (encoder); +intel_encoders_post_disable (crtc, old_state);if (intel_crtc->config->has_pch_encoder) {lpt_disable_pch_transcoder (dev_priv);
@@ -6127,7 +6221,6 @@ static void valleyview_crtc_enable(struct intel_crtc_state *pipe_config,struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -struct intel_encoder *encoder;int pipe = intel_crtc->pipe;if (WARN_ON (intel_crtc->active))
@@ -6152,9 +6245,7 @@ static void valleyview_crtc_enable(struct intel_crtc_state *pipe_config,intel_set_cpu_fifo_underrun_reporting (dev_priv, pipe, true); -for_each_encoder_on_crtc (dev, crtc, encoder) -if (encoder->pre_pll_enable) - encoder->pre_pll_enable (encoder); +intel_encoders_pre_pll_enable (crtc, old_state);if (IS_CHERRYVIEW (dev)) {chv_prepare_pll (intel_crtc, intel_crtc->config);
@@ -6164,9 +6255,7 @@ static void valleyview_crtc_enable(struct intel_crtc_state *pipe_config,vlv_enable_pll (intel_crtc, intel_crtc->config); } -for_each_encoder_on_crtc (dev, crtc, encoder) -if (encoder->pre_enable) - encoder->pre_enable (encoder); +intel_encoders_pre_enable (crtc, old_state);i9xx_pfit_enable (intel_crtc);
@@ -6178,8 +6267,7 @@ static void valleyview_crtc_enable(struct intel_crtc_state *pipe_config,assert_vblank_disabled (crtc);drm_crtc_vblank_on (crtc); -for_each_encoder_on_crtc (dev, crtc, encoder) - encoder->enable (encoder); +intel_encoders_enable (crtc, old_state); }static void i9xx_set_pll_dividers (struct intel_crtc *crtc)
@@ -6198,7 +6286,6 @@ static void i9xx_crtc_enable(struct intel_crtc_state *pipe_config,struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -struct intel_encoder *encoder;enum pipe pipe = intel_crtc->pipe;if (WARN_ON (intel_crtc->active))
@@ -6219,9 +6306,7 @@ static void i9xx_crtc_enable(struct intel_crtc_state *pipe_config,if (!IS_GEN2 (dev))intel_set_cpu_fifo_underrun_reporting (dev_priv, pipe, true); -for_each_encoder_on_crtc (dev, crtc, encoder) -if (encoder->pre_enable) - encoder->pre_enable (encoder); +intel_encoders_pre_enable (crtc, old_state);i9xx_enable_pll (intel_crtc);
@@ -6235,8 +6320,7 @@ static void i9xx_crtc_enable(struct intel_crtc_state *pipe_config,assert_vblank_disabled (crtc);drm_crtc_vblank_on (crtc); -for_each_encoder_on_crtc (dev, crtc, encoder) - encoder->enable (encoder); +intel_encoders_enable (crtc, old_state); }static void i9xx_pfit_disable (struct intel_crtc *crtc)
@@ -6261,7 +6345,6 @@ static void i9xx_crtc_disable(struct intel_crtc_state *old_crtc_state,struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -struct intel_encoder *encoder;int pipe = intel_crtc->pipe;/*
@@ -6271,8 +6354,7 @@ static void i9xx_crtc_disable(struct intel_crtc_state *old_crtc_state,if (IS_GEN2 (dev))intel_wait_for_vblank (dev, pipe); -for_each_encoder_on_crtc (dev, crtc, encoder) - encoder->disable (encoder); +intel_encoders_disable (crtc, old_state);drm_crtc_vblank_off (crtc);assert_vblank_disabled (crtc);
@@ -6281,9 +6363,7 @@ static void i9xx_crtc_disable(struct intel_crtc_state *old_crtc_state,i9xx_pfit_disable (intel_crtc); -for_each_encoder_on_crtc (dev, crtc, encoder) -if (encoder->post_disable) - encoder->post_disable (encoder); +intel_encoders_post_disable (crtc, old_state);if (!intel_crtc_has_type (intel_crtc->config,INTEL_OUTPUT_DSI )) {if (IS_CHERRYVIEW (dev))
@@ -6294,9 +6374,7 @@ static void i9xx_crtc_disable(struct intel_crtc_state *old_crtc_state,i9xx_disable_pll (intel_crtc); } -for_each_encoder_on_crtc (dev, crtc, encoder) -if (encoder->post_pll_disable) - encoder->post_pll_disable (encoder); +intel_encoders_post_pll_disable (crtc, old_state);if (!IS_GEN2 (dev))intel_set_cpu_fifo_underrun_reporting (dev_priv, pipe, false);
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 04/15] drm/i915: Walk over encoders in crtc enable/disable using atomic state.
Quoted 19 lines · Maarten Lankhorst
This cleans up another possible use of the connector list,
encoder->crtcis legacy state and should not be used.With the atomic state as argument it's easy to find the encoder from the connector it belongs to.
intel_opregion_notify_encoderis a noop for !HAS_DDI, so it's harmless to unconditionally include it in encoder enable/disable.Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 190 ++++++++++++++++++++++++----------- 1 file changed, 134 insertions(+), 56 deletions(-)drivers/gpu/drm/i915/intel_display.c +0
-0
drivers/gpu/drm/i915/intel_display.c static void intel_crtc_disable_planes(struct drm_crtc *crtc, unsigned plane_mask · line 4708
Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +2
-0@@ -4704,6 +4704,123 @@ static void intel_crtc_disable_planes(struct drm_crtc *crtc, unsigned plane_maskintel_frontbuffer_flip (dev,INTEL_FRONTBUFFER_ALL_MASK (pipe)); } +static void intel_encoders_pre_pll_enable (struct drm_crtc *crtc, +struct drm_atomic_state *old_state)
This whole old_state thing is very annoying. We're enabling things, so intuitively one would assume that we want to look at the new state. It's not quite as bad here as it's in the cdclk code where old_state actually contain partially old and partially new state.
Would be nice if someone came up with some kind of sane solution for this, that would avoid having to crosswire one's brain. Would be nice to have explicit old and new states I think.
And the magic disable phase is my other main annoyance with atomic. If we had an explicit new state, then splitting the disable+(re)enable sequence into three states should be much easier, so that we'd have a nice transition like so: old_state->stuff_disabled_state->stuff_enabled_state. But of course this migh still be a little hard to achieve on account of atomic unwisely mixing up the user visible state and internal state in the same structures.
Quoted 365 lines
drivers/gpu/drm/i915/intel_display.c +132
-56+{ +struct drm_connector_state *old_conn_state; +struct drm_connector *conn; +int i; + +for_each_connector_in_state (old_state, conn, old_conn_state, i) { +struct drm_connector_state *conn_state = conn->state; +struct intel_encoder *encoder = +to_intel_encoder (conn_state->best_encoder); + +if (conn_state->crtc != crtc) +continue ; + +if (encoder->pre_pll_enable) + encoder->pre_pll_enable (encoder); + } +} + +static void intel_encoders_pre_enable (struct drm_crtc *crtc, +struct drm_atomic_state *old_state) +{ +struct drm_connector_state *old_conn_state; +struct drm_connector *conn; +int i; + +for_each_connector_in_state (old_state, conn, old_conn_state, i) { +struct drm_connector_state *conn_state = conn->state; +struct intel_encoder *encoder = +to_intel_encoder (conn_state->best_encoder); + +if (conn_state->crtc != crtc) +continue ; + +if (encoder->pre_enable) + encoder->pre_enable (encoder); + } +} + +static void intel_encoders_enable (struct drm_crtc *crtc, +struct drm_atomic_state *old_state) +{ +struct drm_connector_state *old_conn_state; +struct drm_connector *conn; +int i; + +for_each_connector_in_state (old_state, conn, old_conn_state, i) { +struct drm_connector_state *conn_state = conn->state; +struct intel_encoder *encoder = +to_intel_encoder (conn_state->best_encoder); + +if (conn_state->crtc != crtc) +continue ; + + encoder->enable (encoder); +intel_opregion_notify_encoder (encoder, true); + } +} + +static void intel_encoders_disable (struct drm_crtc *crtc, +struct drm_atomic_state *old_state) +{ +struct drm_connector_state *old_conn_state; +struct drm_connector *conn; +int i; + +for_each_connector_in_state (old_state, conn, old_conn_state, i) { +struct intel_encoder *encoder = +to_intel_encoder (old_conn_state->best_encoder); + +if (old_conn_state->crtc != crtc) +continue ; + +intel_opregion_notify_encoder (encoder, false); + encoder->disable (encoder); + } +} + +static void intel_encoders_post_disable (struct drm_crtc *crtc, +struct drm_atomic_state *old_state) +{ +struct drm_connector_state *old_conn_state; +struct drm_connector *conn; +int i; + +for_each_connector_in_state (old_state, conn, old_conn_state, i) { +struct intel_encoder *encoder = +to_intel_encoder (old_conn_state->best_encoder); + +if (old_conn_state->crtc != crtc) +continue ; + +if (encoder->post_disable) + encoder->post_disable (encoder); + } +} + +static void intel_encoders_post_pll_disable (struct drm_crtc *crtc, +struct drm_atomic_state *old_state) +{ +struct drm_connector_state *old_conn_state; +struct drm_connector *conn; +int i; + +for_each_connector_in_state (old_state, conn, old_conn_state, i) { +struct intel_encoder *encoder = +to_intel_encoder (old_conn_state->best_encoder); + +if (old_conn_state->crtc != crtc) +continue ; + +if (encoder->post_pll_disable) + encoder->post_pll_disable (encoder); + } +} +static void ironlake_crtc_enable (struct intel_crtc_state *pipe_config,struct drm_atomic_state *old_state) {@@ -4711,7 +4828,6 @@ static void ironlake_crtc_enable(struct intel_crtc_state *pipe_config,struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -struct intel_encoder *encoder;int pipe = intel_crtc->pipe;if (WARN_ON (intel_crtc->active))@@ -4750,9 +4866,7 @@ static void ironlake_crtc_enable(struct intel_crtc_state *pipe_config, intel_crtc->active = true; -for_each_encoder_on_crtc (dev, crtc, encoder) -if (encoder->pre_enable) - encoder->pre_enable (encoder); +intel_encoders_pre_enable (crtc, old_state);if (intel_crtc->config->has_pch_encoder) {/* Note: FDI PLL enabling _must_ be done before we enable the @@ -4782,8 +4896,7 @@ static void ironlake_crtc_enable(struct intel_crtc_state *pipe_config,assert_vblank_disabled (crtc);drm_crtc_vblank_on (crtc); -for_each_encoder_on_crtc (dev, crtc, encoder) - encoder->enable (encoder); +intel_encoders_enable (crtc, old_state);if (HAS_PCH_CPT (dev))cpt_verify_modeset (dev, intel_crtc->pipe);@@ -4808,7 +4921,6 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -struct intel_encoder *encoder;int pipe = intel_crtc->pipe, hsw_workaround_pipe;enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder;@@ -4819,9 +4931,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,intel_set_pch_fifo_underrun_reporting (dev_priv,TRANSCODER_A , false); -for_each_encoder_on_crtc (dev, crtc, encoder) -if (encoder->pre_pll_enable) - encoder->pre_pll_enable (encoder); +intel_encoders_pre_pll_enable (crtc, old_state);if (intel_crtc->config->shared_dpll)intel_enable_shared_dpll (intel_crtc);@@ -4859,10 +4969,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,else intel_set_cpu_fifo_underrun_reporting (dev_priv, pipe, true); -for_each_encoder_on_crtc (dev, crtc, encoder) { -if (encoder->pre_enable) - encoder->pre_enable (encoder); - } +intel_encoders_pre_enable (crtc, old_state);if (intel_crtc->config->has_pch_encoder) dev_priv->display.fdi_link_train (crtc);@@ -4903,10 +5010,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,assert_vblank_disabled (crtc);drm_crtc_vblank_on (crtc); -for_each_encoder_on_crtc (dev, crtc, encoder) { - encoder->enable (encoder); -intel_opregion_notify_encoder (encoder, true); - } +intel_encoders_enable (crtc, old_state);if (intel_crtc->config->has_pch_encoder) {intel_wait_for_vblank (dev, pipe);@@ -4947,7 +5051,6 @@ static void ironlake_crtc_disable(struct intel_crtc_state *old_crtc_state,struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -struct intel_encoder *encoder;int pipe = intel_crtc->pipe;/* @@ -4960,8 +5063,7 @@ static void ironlake_crtc_disable(struct intel_crtc_state *old_crtc_state,intel_set_pch_fifo_underrun_reporting (dev_priv, pipe, false); } -for_each_encoder_on_crtc (dev, crtc, encoder) - encoder->disable (encoder); +intel_encoders_disable (crtc, old_state);drm_crtc_vblank_off (crtc);assert_vblank_disabled (crtc);@@ -4973,9 +5075,7 @@ static void ironlake_crtc_disable(struct intel_crtc_state *old_crtc_state,if (intel_crtc->config->has_pch_encoder)ironlake_fdi_disable (crtc); -for_each_encoder_on_crtc (dev, crtc, encoder) -if (encoder->post_disable) - encoder->post_disable (encoder); +intel_encoders_post_disable (crtc, old_state);if (intel_crtc->config->has_pch_encoder) {ironlake_disable_pch_transcoder (dev_priv, pipe);@@ -5012,17 +5112,13 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -struct intel_encoder *encoder;enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder;if (intel_crtc->config->has_pch_encoder)intel_set_pch_fifo_underrun_reporting (dev_priv,TRANSCODER_A , false); -for_each_encoder_on_crtc (dev, crtc, encoder) { -intel_opregion_notify_encoder (encoder, false); - encoder->disable (encoder); - } +intel_encoders_disable (crtc, old_state);drm_crtc_vblank_off (crtc);assert_vblank_disabled (crtc);@@ -5045,9 +5141,7 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,if (!transcoder_is_dsi (cpu_transcoder))intel_ddi_disable_pipe_clock (intel_crtc); -for_each_encoder_on_crtc (dev, crtc, encoder) -if (encoder->post_disable) - encoder->post_disable (encoder); +intel_encoders_post_disable (crtc, old_state);if (intel_crtc->config->has_pch_encoder) {lpt_disable_pch_transcoder (dev_priv);@@ -6127,7 +6221,6 @@ static void valleyview_crtc_enable(struct intel_crtc_state *pipe_config,struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -struct intel_encoder *encoder;int pipe = intel_crtc->pipe;if (WARN_ON (intel_crtc->active))@@ -6152,9 +6245,7 @@ static void valleyview_crtc_enable(struct intel_crtc_state *pipe_config,intel_set_cpu_fifo_underrun_reporting (dev_priv, pipe, true); -for_each_encoder_on_crtc (dev, crtc, encoder) -if (encoder->pre_pll_enable) - encoder->pre_pll_enable (encoder); +intel_encoders_pre_pll_enable (crtc, old_state);if (IS_CHERRYVIEW (dev)) {chv_prepare_pll (intel_crtc, intel_crtc->config);@@ -6164,9 +6255,7 @@ static void valleyview_crtc_enable(struct intel_crtc_state *pipe_config,vlv_enable_pll (intel_crtc, intel_crtc->config); } -for_each_encoder_on_crtc (dev, crtc, encoder) -if (encoder->pre_enable) - encoder->pre_enable (encoder); +intel_encoders_pre_enable (crtc, old_state);i9xx_pfit_enable (intel_crtc);@@ -6178,8 +6267,7 @@ static void valleyview_crtc_enable(struct intel_crtc_state *pipe_config,assert_vblank_disabled (crtc);drm_crtc_vblank_on (crtc); -for_each_encoder_on_crtc (dev, crtc, encoder) - encoder->enable (encoder); +intel_encoders_enable (crtc, old_state); }static void i9xx_set_pll_dividers (struct intel_crtc *crtc)@@ -6198,7 +6286,6 @@ static void i9xx_crtc_enable(struct intel_crtc_state *pipe_config,struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -struct intel_encoder *encoder;enum pipe pipe = intel_crtc->pipe;if (WARN_ON (intel_crtc->active))@@ -6219,9 +6306,7 @@ static void i9xx_crtc_enable(struct intel_crtc_state *pipe_config,if (!IS_GEN2 (dev))intel_set_cpu_fifo_underrun_reporting (dev_priv, pipe, true); -for_each_encoder_on_crtc (dev, crtc, encoder) -if (encoder->pre_enable) - encoder->pre_enable (encoder); +intel_encoders_pre_enable (crtc, old_state);i9xx_enable_pll (intel_crtc);@@ -6235,8 +6320,7 @@ static void i9xx_crtc_enable(struct intel_crtc_state *pipe_config,assert_vblank_disabled (crtc);drm_crtc_vblank_on (crtc); -for_each_encoder_on_crtc (dev, crtc, encoder) - encoder->enable (encoder); +intel_encoders_enable (crtc, old_state); }static void i9xx_pfit_disable (struct intel_crtc *crtc)@@ -6261,7 +6345,6 @@ static void i9xx_crtc_disable(struct intel_crtc_state *old_crtc_state,struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -struct intel_encoder *encoder;int pipe = intel_crtc->pipe;/* @@ -6271,8 +6354,7 @@ static void i9xx_crtc_disable(struct intel_crtc_state *old_crtc_state,if (IS_GEN2 (dev))intel_wait_for_vblank (dev, pipe); -for_each_encoder_on_crtc (dev, crtc, encoder) - encoder->disable (encoder); +intel_encoders_disable (crtc, old_state);drm_crtc_vblank_off (crtc);assert_vblank_disabled (crtc);@@ -6281,9 +6363,7 @@ static void i9xx_crtc_disable(struct intel_crtc_state *old_crtc_state,i9xx_pfit_disable (intel_crtc); -for_each_encoder_on_crtc (dev, crtc, encoder) -if (encoder->post_disable) - encoder->post_disable (encoder); +intel_encoders_post_disable (crtc, old_state);if (!intel_crtc_has_type (intel_crtc->config,INTEL_OUTPUT_DSI )) {if (IS_CHERRYVIEW (dev))@@ -6294,9 +6374,7 @@ static void i9xx_crtc_disable(struct intel_crtc_state *old_crtc_state,i9xx_disable_pll (intel_crtc); } -for_each_encoder_on_crtc (dev, crtc, encoder) -if (encoder->post_pll_disable) - encoder->post_pll_disable (encoder); +intel_encoders_post_pll_disable (crtc, old_state);if (!IS_GEN2 (dev))intel_set_cpu_fifo_underrun_reporting (dev_priv, pipe, false);Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 04/15] drm/i915: Walk over encoders in crtc enable/disable using atomic state.
Op 08-07-16 om 12:30 schreef Ville Syrjälä:
Quoted 34 lines · Maarten Lankhorst
Quoted 19 lines
This cleans up another possible use of the connector list,
encoder->crtcis legacy state and should not be used.With the atomic state as argument it's easy to find the encoder from the connector it belongs to.
intel_opregion_notify_encoderis a noop for !HAS_DDI, so it's harmless to unconditionally include it in encoder enable/disable.Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 190 ++++++++++++++++++++++++----------- 1 file changed, 134 insertions(+), 56 deletions(-)drivers/gpu/drm/i915/intel_display.c +0
-0drivers/gpu/drm/i915/intel_display.c static void intel_crtc_disable_planes(struct drm_crtc *crtc, unsigned plane_mask · line 4708
Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +2
-0@@ -4704,6 +4704,123 @@ static void intel_crtc_disable_planes(struct drm_crtc *crtc, unsigned plane_maskintel_frontbuffer_flip (dev,INTEL_FRONTBUFFER_ALL_MASK (pipe)); } +static void intel_encoders_pre_pll_enable (struct drm_crtc *crtc, +struct drm_atomic_state *old_state)This whole
old_statething is very annoying. We're enabling things, so intuitively one would assume that we want to look at the new state. It's not quite as bad here as it's in the cdclk code whereold_stateactually contain partially old and partially new state.Would be nice if someone came up with some kind of sane solution for this, that would avoid having to crosswire one's brain. Would be nice to have explicit old and new states I think.
Quoted 8 lines
And the magic disable phase is my other main annoyance with atomic. If we had an explicit new state, then splitting the disable+(re)enable sequence into three states should be much easier, so that we'd have a nice transition like so:
old_state->stuff_disabled_state->stuff_enabled_state. But of course this migh still be a little hard to achieve on account of atomic unwisely mixing up the user visible state and internal state in the same structures.
Agreed, although the real bummer is different meaning to the state pointer before and after commit. Before it contains the new state, after the old. It would make more sense to have a pointer to both, and differentiate using for_each_<old,new>_<plane,connector,crtc>_in_state
Maybe an option to use both states as well, for the few places that would need it, mostly in atomic check.
~Maarten
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/15 drm/i915: Pass crtc_state and connector_state to encoder functions
In reply to Maarten LankhorstThis is mostly code churn, with exception of a few places:
- intel_display.c has changes in intel_sanitize_encoder
- intel_ddi.c has intel_ddi_fdi_disable calling intel_ddi_post_disable, and required a function change. Also affects intel_display.c
- intel_dp_mst.c passes a NULL crtc_state and conn_state to intel_ddi_post_disable for shutting down the real encoder.
No other functional changes are done, diff stat is already huge. Each encoder type will need to be fixed to use the atomic states separately.
--- drivers/gpu/drm/i915/intel_crt.c | 18 +++++-- drivers/gpu/drm/i915/intel_ddi.c | 31 +++++++---- drivers/gpu/drm/i915/intel_display.c | 102 ++++++++++++++++++++--------------- drivers/gpu/drm/i915/intel_dp.c | 48 ++++++++++++----- drivers/gpu/drm/i915/intel_dp_mst.c | 20 +++++-- drivers/gpu/drm/i915/intel_drv.h | 28 +++++++--- drivers/gpu/drm/i915/intel_dsi.c | 16 ++++-- drivers/gpu/drm/i915/intel_dvo.c | 12 +++-- drivers/gpu/drm/i915/intel_hdmi.c | 72 ++++++++++++++++++------- drivers/gpu/drm/i915/intel_lvds.c | 29 +++++++--- drivers/gpu/drm/i915/intel_sdvo.c | 22 +++++--- drivers/gpu/drm/i915/intel_tv.c | 12 +++-- 12 files changed, 284 insertions(+), 126 deletions(-)
drivers/gpu/drm/i915/intel_crt.c +13 -5
@@ -193,21 +193,29 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder, int mode)I915_WRITE (crt->adpa_reg, adpa); } -static void intel_disable_crt (struct intel_encoder *encoder) +static void intel_disable_crt (struct intel_encoder *encoder, +struct intel_crtc_state *old_crtc_state, +struct drm_connector_state *old_conn_state) {intel_crt_set_dpms (encoder,DRM_MODE_DPMS_OFF ); } -static void pch_disable_crt (struct intel_encoder *encoder) +static void pch_disable_crt (struct intel_encoder *encoder, +struct intel_crtc_state *old_crtc_state, +struct drm_connector_state *old_conn_state) { } -static void pch_post_disable_crt (struct intel_encoder *encoder) +static void pch_post_disable_crt (struct intel_encoder *encoder, +struct intel_crtc_state *old_crtc_state, +struct drm_connector_state *old_conn_state) { -intel_disable_crt (encoder); +intel_disable_crt (encoder, old_crtc_state, old_conn_state); } -static void intel_enable_crt (struct intel_encoder *encoder) +static void intel_enable_crt (struct intel_encoder *encoder, +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state) {intel_crt_set_dpms (encoder,DRM_MODE_DPMS_ON ); }
drivers/gpu/drm/i915/intel_ddi.c +22 -9
@@ -1601,7 +1601,9 @@ void intel_ddi_clk_select(struct intel_encoder *encoder, } } -static void intel_ddi_pre_enable (struct intel_encoder *intel_encoder) +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 drm_i915_private *dev_priv =to_i915 (encoder->dev);
@@ -1644,7 +1646,9 @@ static void intel_ddi_pre_enable(struct intel_encoder *intel_encoder) } } -static void intel_ddi_post_disable (struct intel_encoder *intel_encoder) +static void intel_ddi_post_disable (struct intel_encoder *intel_encoder, +struct intel_crtc_state *old_crtc_state, +struct drm_connector_state *old_conn_state) {struct drm_encoder *encoder = &intel_encoder->base;struct drm_device *dev = encoder->dev;
@@ -1654,6 +1658,8 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder)uint32_t val;bool wait = false; +/* old_crtc_state and old_conn_state are NULL when called from DP_MST */ + val =I915_READ (DDI_BUF_CTL (port));if (val &DDI_BUF_CTL_ENABLE ) { val &= ~DDI_BUF_CTL_ENABLE ;
@@ -1689,7 +1695,9 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder) } } -static void intel_enable_ddi (struct intel_encoder *intel_encoder) +static void intel_enable_ddi (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 drm_crtc *crtc = encoder->crtc;
@@ -1727,7 +1735,9 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder) } } -static void intel_disable_ddi (struct intel_encoder *intel_encoder) +static void intel_disable_ddi (struct intel_encoder *intel_encoder, +struct intel_crtc_state *old_crtc_state, +struct drm_connector_state *old_conn_state) {struct drm_encoder *encoder = &intel_encoder->base;struct drm_crtc *crtc = encoder->crtc;
@@ -2033,7 +2043,9 @@ bxt_ddi_phy_calc_lane_lat_optim_mask(struct intel_encoder *encoder, } } -static void bxt_ddi_pre_pll_enable (struct intel_encoder *encoder) +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_digital_port *dport =enc_to_dig_port (&encoder->base);struct drm_i915_private *dev_priv =to_i915 (dport->base.base.dev);
@@ -2122,10 +2134,11 @@ void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp)udelay (600 ); } -void intel_ddi_fdi_disable (struct drm_crtc *crtc) +void intel_ddi_fdi_disable (struct intel_encoder *intel_encoder, +struct intel_crtc_state *old_crtc_state, +struct drm_connector_state *old_conn_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc->dev); -struct intel_encoder *intel_encoder =intel_ddi_get_crtc_encoder (crtc); +struct drm_i915_private *dev_priv =to_i915 (intel_encoder->base.dev);uint32_t val;/*
@@ -2138,7 +2151,7 @@ void intel_ddi_fdi_disable(struct drm_crtc *crtc) val &= ~FDI_RX_ENABLE ;I915_WRITE (FDI_RX_CTL (PIPE_A ), val); -intel_ddi_post_disable (intel_encoder); +intel_ddi_post_disable (intel_encoder, old_crtc_state, old_conn_state); val =I915_READ (FDI_RX_MISC (PIPE_A )); val &= ~(FDI_RX_PWRDN_LANE1_MASK |FDI_RX_PWRDN_LANE0_MASK );
drivers/gpu/drm/i915/intel_display.c +58 -44
305 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dp.c +36 -12
120 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dp_mst.c +15 -5
@@ -92,7 +92,9 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder, } -static void intel_mst_disable_dp (struct intel_encoder *encoder) +static void intel_mst_disable_dp (struct intel_encoder *encoder, +struct intel_crtc_state *old_crtc_state, +struct drm_connector_state *old_conn_state) {struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_digital_port *intel_dig_port = intel_mst->primary;
@@ -109,7 +111,9 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder) } } -static void intel_mst_post_disable_dp (struct intel_encoder *encoder) +static void intel_mst_post_disable_dp (struct intel_encoder *encoder, +struct intel_crtc_state *old_crtc_state, +struct drm_connector_state *old_conn_state) {struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_digital_port *intel_dig_port = intel_mst->primary;
@@ -128,12 +132,16 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder) intel_mst->connector =NULL ;if (intel_dp->active_mst_links ==0 ) { - intel_dig_port->base.post_disable (&intel_dig_port->base); + intel_dig_port->base.post_disable (&intel_dig_port->base, + old_crtc_state,NULL ); +intel_dp_sink_dpms (intel_dp,DRM_MODE_DPMS_OFF ); } } -static void intel_mst_pre_enable_dp (struct intel_encoder *encoder) +static void intel_mst_pre_enable_dp (struct intel_encoder *encoder, +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state) {struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_digital_port *intel_dig_port = intel_mst->primary;
@@ -200,7 +208,9 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder) ret =drm_dp_update_payload_part1 (&intel_dp->mst_mgr); } -static void intel_mst_enable_dp (struct intel_encoder *encoder) +static void intel_mst_enable_dp (struct intel_encoder *encoder, +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state) {struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_digital_port *intel_dig_port = intel_mst->primary;
drivers/gpu/drm/i915/intel_drv.h +21 -7
@@ -195,12 +195,24 @@ struct intel_encoder {void (*hot_plug)(struct intel_encoder *);bool (*compute_config)(struct intel_encoder *,struct intel_crtc_state *); -void (*pre_pll_enable)(struct intel_encoder *); -void (*pre_enable)(struct intel_encoder *); -void (*enable)(struct intel_encoder *); -void (*disable)(struct intel_encoder *); -void (*post_disable)(struct intel_encoder *); -void (*post_pll_disable)(struct intel_encoder *); +void (*pre_pll_enable)(struct intel_encoder *, +struct intel_crtc_state *, +struct drm_connector_state *); +void (*pre_enable)(struct intel_encoder *, +struct intel_crtc_state *, +struct drm_connector_state *); +void (*enable)(struct intel_encoder *, +struct intel_crtc_state *, +struct drm_connector_state *); +void (*disable)(struct intel_encoder *, +struct intel_crtc_state *, +struct drm_connector_state *); +void (*post_disable)(struct intel_encoder *, +struct intel_crtc_state *, +struct drm_connector_state *); +void (*post_pll_disable)(struct intel_encoder *, +struct intel_crtc_state *, +struct drm_connector_state *);/* Read out the current hw state of this connector, returning true if * the encoder is active. If the encoder is enabled it also set the pipe * it is connected to in the pipe parameter. */
@@ -1121,7 +1133,9 @@ bool intel_ddi_pll_select(struct intel_crtc *crtc,void intel_ddi_set_pipe_settings (struct drm_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); -void intel_ddi_fdi_disable (struct drm_crtc *crtc); +void intel_ddi_fdi_disable (struct intel_encoder *, +struct intel_crtc_state *, +struct drm_connector_state *);void intel_ddi_get_config (struct intel_encoder *encoder,struct intel_crtc_state *pipe_config); struct intel_encoder *
drivers/gpu/drm/i915/intel_dsi.c +12 -4
@@ -535,7 +535,9 @@ static void intel_dsi_enable(struct intel_encoder *encoder)static void intel_dsi_prepare (struct intel_encoder *intel_encoder); -static void intel_dsi_pre_enable (struct intel_encoder *encoder) +static void intel_dsi_pre_enable (struct intel_encoder *encoder, +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state) {struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -582,7 +584,9 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder)intel_dsi_enable (encoder); } -static void intel_dsi_enable_nop (struct intel_encoder *encoder) +static void intel_dsi_enable_nop (struct intel_encoder *encoder, +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state) {DRM_DEBUG_KMS ("\n" );
@@ -592,7 +596,9 @@ static void intel_dsi_enable_nop(struct intel_encoder *encoder)*/ } -static void intel_dsi_pre_disable (struct intel_encoder *encoder) +static void intel_dsi_pre_disable (struct intel_encoder *encoder, +struct intel_crtc_state *old_crtc_state, +struct drm_connector_state *old_conn_state) {struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);enum port port;
@@ -694,7 +700,9 @@ static void intel_dsi_clear_device_ready(struct intel_encoder *encoder)intel_disable_dsi_pll (encoder); } -static void intel_dsi_post_disable (struct intel_encoder *encoder) +static void intel_dsi_post_disable (struct intel_encoder *encoder, +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);
drivers/gpu/drm/i915/intel_dvo.c +9 -3
@@ -174,7 +174,9 @@ static void intel_dvo_get_config(struct intel_encoder *encoder, pipe_config->base.adjusted_mode.crtc_clock = pipe_config->port_clock; } -static void intel_disable_dvo (struct intel_encoder *encoder) +static void intel_disable_dvo (struct intel_encoder *encoder, +struct intel_crtc_state *old_crtc_state, +struct drm_connector_state *old_conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dvo *intel_dvo =enc_to_dvo (encoder);
@@ -186,7 +188,9 @@ static void intel_disable_dvo(struct intel_encoder *encoder)I915_READ (dvo_reg); } -static void intel_enable_dvo (struct intel_encoder *encoder) +static void intel_enable_dvo (struct intel_encoder *encoder, +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dvo *intel_dvo =enc_to_dvo (encoder);
@@ -253,7 +257,9 @@ static bool intel_dvo_compute_config(struct intel_encoder *encoder,return true; } -static void intel_dvo_pre_enable (struct intel_encoder *encoder) +static void intel_dvo_pre_enable (struct intel_encoder *encoder, +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state) {struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);
drivers/gpu/drm/i915/intel_hdmi.c +52 -20
175 lines not on this page · raw message
drivers/gpu/drm/i915/intel_lvds.c +21 -8
@@ -136,7 +136,9 @@ static void intel_lvds_get_config(struct intel_encoder *encoder, pipe_config->base.adjusted_mode.crtc_clock = pipe_config->port_clock; } -static void intel_pre_enable_lvds (struct intel_encoder *encoder) +static void intel_pre_enable_lvds (struct intel_encoder *encoder, +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state) {struct intel_lvds_encoder *lvds_encoder =to_lvds_encoder (&encoder->base);struct drm_device *dev = encoder->base.dev;
@@ -210,7 +212,9 @@ static void intel_pre_enable_lvds(struct intel_encoder *encoder)/** * Sets the power state for the panel. */ -static void intel_enable_lvds (struct intel_encoder *encoder) +static void intel_enable_lvds (struct intel_encoder *encoder, +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state) {struct drm_device *dev = encoder->base.dev;struct intel_lvds_encoder *lvds_encoder =to_lvds_encoder (&encoder->base);
@@ -237,7 +241,9 @@ static void intel_enable_lvds(struct intel_encoder *encoder)intel_panel_enable_backlight (intel_connector); } -static void intel_disable_lvds (struct intel_encoder *encoder) +static void intel_disable_lvds (struct intel_encoder *encoder, +struct intel_crtc_state *old_crtc_state, +struct drm_connector_state *old_conn_state) {struct drm_device *dev = encoder->base.dev;struct intel_lvds_encoder *lvds_encoder =to_lvds_encoder (&encoder->base);
@@ -260,7 +266,10 @@ static void intel_disable_lvds(struct intel_encoder *encoder)POSTING_READ (lvds_encoder->reg); } -static void gmch_disable_lvds (struct intel_encoder *encoder) +static void gmch_disable_lvds (struct intel_encoder *encoder, +struct intel_crtc_state *old_crtc_state, +struct drm_connector_state *old_conn_state) + {struct intel_lvds_encoder *lvds_encoder =to_lvds_encoder (&encoder->base); struct intel_connector *intel_connector =
@@ -268,10 +277,12 @@ static void gmch_disable_lvds(struct intel_encoder *encoder)intel_panel_disable_backlight (intel_connector); -intel_disable_lvds (encoder); +intel_disable_lvds (encoder, old_crtc_state, old_conn_state); } -static void pch_disable_lvds (struct intel_encoder *encoder) +static void pch_disable_lvds (struct intel_encoder *encoder, +struct intel_crtc_state *old_crtc_state, +struct drm_connector_state *old_conn_state) {struct intel_lvds_encoder *lvds_encoder =to_lvds_encoder (&encoder->base); struct intel_connector *intel_connector =
@@ -280,9 +291,11 @@ static void pch_disable_lvds(struct intel_encoder *encoder)intel_panel_disable_backlight (intel_connector); } -static void pch_post_disable_lvds (struct intel_encoder *encoder) +static void pch_post_disable_lvds (struct intel_encoder *encoder, +struct intel_crtc_state *old_crtc_state, +struct drm_connector_state *old_conn_state) { -intel_disable_lvds (encoder); +intel_disable_lvds (encoder, old_crtc_state, old_conn_state); } static enum drm_mode_status
drivers/gpu/drm/i915/intel_sdvo.c +16 -6
@@ -1192,7 +1192,9 @@ static bool intel_sdvo_compute_config(struct intel_encoder *encoder,return true; } -static void intel_sdvo_pre_enable (struct intel_encoder *intel_encoder) +static void intel_sdvo_pre_enable (struct intel_encoder *intel_encoder, +struct intel_crtc_state *crtc_state, +struct drm_connector_state *conn_state) {struct drm_device *dev = intel_encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -1434,7 +1436,9 @@ static void intel_sdvo_get_config(struct intel_encoder *encoder, pipe_config->pixel_multiplier, encoder_pixel_multiplier); } -static void intel_disable_sdvo (struct intel_encoder *encoder) +static void intel_disable_sdvo (struct intel_encoder *encoder, +struct intel_crtc_state *old_crtc_state, +struct drm_connector_state *conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_sdvo *intel_sdvo =to_sdvo (encoder);
@@ -1477,16 +1481,22 @@ static void intel_disable_sdvo(struct intel_encoder *encoder) } } -static void pch_disable_sdvo (struct intel_encoder *encoder) +static void pch_disable_sdvo (struct intel_encoder *encoder, +struct intel_crtc_state *old_crtc_state, +struct drm_connector_state *old_conn_state) { } -static void pch_post_disable_sdvo (struct intel_encoder *encoder) +static void pch_post_disable_sdvo (struct intel_encoder *encoder, +struct intel_crtc_state *old_crtc_state, +struct drm_connector_state *old_conn_state) { -intel_disable_sdvo (encoder); +intel_disable_sdvo (encoder, old_crtc_state, old_conn_state); } -static void intel_enable_sdvo (struct intel_encoder *encoder) +static void intel_enable_sdvo (struct intel_encoder *encoder, +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state) {struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);
drivers/gpu/drm/i915/intel_tv.c +9 -3
@@ -838,7 +838,9 @@ intel_tv_get_hw_state(struct intel_encoder *encoder, enum pipe *pipe) }static void -intel_enable_tv (struct intel_encoder *encoder) +intel_enable_tv (struct intel_encoder *encoder, +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state) {struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -851,7 +853,9 @@ intel_enable_tv(struct intel_encoder *encoder) }static void -intel_disable_tv (struct intel_encoder *encoder) +intel_disable_tv (struct intel_encoder *encoder, +struct intel_crtc_state *old_crtc_state, +struct drm_connector_state *old_conn_state) {struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -1010,7 +1014,9 @@ static void set_color_conversion(struct drm_i915_private *dev_priv, color_conversion->av); } -static void intel_tv_pre_enable (struct intel_encoder *encoder) +static void intel_tv_pre_enable (struct intel_encoder *encoder, +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state) {struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/15 drm/i915: Make encoder->compute_config take the connector state
In reply to Maarten LankhorstSome places iterate over connector_state to find the right connector, pass it along as argument.
--- drivers/gpu/drm/i915/intel_crt.c | 3 ++- drivers/gpu/drm/i915/intel_ddi.c | 7 ++++--- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/i915/intel_dp.c | 3 ++- drivers/gpu/drm/i915/intel_dp_mst.c | 4 ++-- drivers/gpu/drm/i915/intel_drv.h | 9 ++++++--- drivers/gpu/drm/i915/intel_dsi.c | 3 ++- drivers/gpu/drm/i915/intel_dvo.c | 3 ++- drivers/gpu/drm/i915/intel_hdmi.c | 3 ++- drivers/gpu/drm/i915/intel_lvds.c | 3 ++- drivers/gpu/drm/i915/intel_sdvo.c | 3 ++- drivers/gpu/drm/i915/intel_tv.c | 3 ++- 12 files changed, 29 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/intel_crt.c +2 -1
@@ -261,7 +261,8 @@ intel_crt_mode_valid(struct drm_connector *connector, }static bool intel_crt_compute_config (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config) +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state) {struct drm_device *dev = encoder->base.dev;
drivers/gpu/drm/i915/intel_ddi.c +4 -3
@@ -2266,7 +2266,8 @@ void intel_ddi_get_config(struct intel_encoder *encoder, }static bool intel_ddi_compute_config (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config) +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);int type = encoder->type;
@@ -2279,9 +2280,9 @@ static bool intel_ddi_compute_config(struct intel_encoder *encoder, pipe_config->cpu_transcoder =TRANSCODER_EDP ;if (type ==INTEL_OUTPUT_HDMI ) - ret =intel_hdmi_compute_config (encoder, pipe_config); + ret =intel_hdmi_compute_config (encoder, pipe_config, conn_state);else - ret =intel_dp_compute_config (encoder, pipe_config); + ret =intel_dp_compute_config (encoder, pipe_config, conn_state);if (IS_BROXTON (dev_priv) && ret) pipe_config->lane_lat_optim_mask =
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -12596,7 +12596,7 @@ encoder_retry: encoder =to_intel_encoder (connector_state->best_encoder); -if (!(encoder->compute_config (encoder, pipe_config))) { +if (!(encoder->compute_config (encoder, pipe_config, connector_state))) {DRM_DEBUG_KMS ("Encoder config failure\n" ); goto fail; }
drivers/gpu/drm/i915/intel_dp.c +2 -1
@@ -1470,7 +1470,8 @@ void intel_dp_compute_rate(struct intel_dp *intel_dp, int port_clock,bool intel_dp_compute_config (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config) +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state) {struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);
drivers/gpu/drm/i915/intel_dp_mst.c +2 -2
@@ -31,7 +31,8 @@#include <drm/drm_edid.h> static bool intel_dp_mst_compute_config (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config) +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state) {struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_digital_port *intel_dig_port = intel_mst->primary;
@@ -54,7 +55,6 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,*/ lane_count =drm_dp_max_lane_count (intel_dp->dpcd); - pipe_config->lane_count = lane_count; pipe_config->pipe_bpp =24 ;
drivers/gpu/drm/i915/intel_drv.h +6 -3
@@ -194,7 +194,8 @@ struct intel_encoder {unsigned int cloneable;void (*hot_plug)(struct intel_encoder *);bool (*compute_config)(struct intel_encoder *, -struct intel_crtc_state *); +struct intel_crtc_state *, +struct drm_connector_state *);void (*pre_pll_enable)(struct intel_encoder *,struct intel_crtc_state *,struct drm_connector_state *);
@@ -1377,7 +1378,8 @@ void intel_dp_encoder_suspend(struct intel_encoder *intel_encoder);void intel_dp_encoder_destroy (struct drm_encoder *encoder);int intel_dp_sink_crc (struct intel_dp *intel_dp,u8 *crc);bool intel_dp_compute_config (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config); +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state);bool intel_dp_is_edp (struct drm_device *dev,enum port port);enum irqreturn intel_dp_hpd_pulse (struct intel_digital_port *intel_dig_port,bool long_hpd);
@@ -1499,7 +1501,8 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, struct intel_connector *intel_connector);struct intel_hdmi *enc_to_intel_hdmi (struct drm_encoder *encoder);bool intel_hdmi_compute_config (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config); +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state);void intel_dp_dual_mode_set_tmds_output (struct intel_hdmi *hdmi,bool enable);
drivers/gpu/drm/i915/intel_dsi.c +2 -1
@@ -312,7 +312,8 @@ static inline bool is_cmd_mode(struct intel_dsi *intel_dsi) }static bool intel_dsi_compute_config (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config) +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi,
drivers/gpu/drm/i915/intel_dvo.c +2 -1
@@ -239,7 +239,8 @@ intel_dvo_mode_valid(struct drm_connector *connector, }static bool intel_dvo_compute_config (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config) +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state) {struct intel_dvo *intel_dvo =enc_to_dvo (encoder); const struct drm_display_mode *fixed_mode =
drivers/gpu/drm/i915/intel_hdmi.c +2 -1
@@ -1301,7 +1301,8 @@ static bool hdmi_12bpc_possible(struct intel_crtc_state *crtc_state) }bool intel_hdmi_compute_config (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config) +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state) {struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (&encoder->base);struct drm_device *dev = encoder->base.dev;
drivers/gpu/drm/i915/intel_lvds.c +2 -1
@@ -317,7 +317,8 @@ intel_lvds_mode_valid(struct drm_connector *connector, }static bool intel_lvds_compute_config (struct intel_encoder *intel_encoder, -struct intel_crtc_state *pipe_config) +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state) {struct drm_device *dev = intel_encoder->base.dev; struct intel_lvds_encoder *lvds_encoder =
drivers/gpu/drm/i915/intel_sdvo.c +2 -1
@@ -1125,7 +1125,8 @@ static void i9xx_adjust_sdvo_tv_clock(struct intel_crtc_state *pipe_config) }static bool intel_sdvo_compute_config (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config) +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state) {struct intel_sdvo *intel_sdvo =to_sdvo (encoder);struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
drivers/gpu/drm/i915/intel_tv.c +2 -1
@@ -912,7 +912,8 @@ intel_tv_get_config(struct intel_encoder *encoder,static bool intel_tv_compute_config (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config) +struct intel_crtc_state *pipe_config, +struct drm_connector_state *conn_state) {struct intel_tv *intel_tv =enc_to_tv (encoder);const struct tv_mode *tv_mode =intel_tv_mode_find (intel_tv);
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/15 drm/i915: Remove unused loop from intel_dp_mst_compute_config
In reply to Maarten Lankhorstconn_state is passed as argument now, if anything required conn_state they can get it without having to look it up.
--- drivers/gpu/drm/i915/intel_dp_mst.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-)
drivers/gpu/drm/i915/intel_dp_mst.c +1 -18
@@ -38,12 +38,9 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,struct intel_digital_port *intel_dig_port = intel_mst->primary;struct intel_dp *intel_dp = &intel_dig_port->dp;struct drm_atomic_state *state; -int bpp, i; +int bpp;int lane_count, slots;const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; -struct drm_connector *drm_connector; -struct intel_connector *connector, *found =NULL ; -struct drm_connector_state *connector_state;int mst_pbn; pipe_config->dp_encoder_is_mst = true;
@@ -62,20 +59,6 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder, state = pipe_config->base.state; -for_each_connector_in_state (state, drm_connector, connector_state, i) { - connector =to_intel_connector (drm_connector); - -if (connector_state->best_encoder == &encoder->base) { - found = connector; -break ; - } - } - -if (!found) { -DRM_ERROR ("can't find connector\n" ); -return false; - } - mst_pbn =drm_dp_calc_pbn_mode (adjusted_mode->crtc_clock, bpp); pipe_config->pbn = mst_pbn;
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/15 drm/i915: Convert intel_crt to use atomic state
In reply to Maarten Lankhorst--- drivers/gpu/drm/i915/intel_crt.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_crt.c +7 -5
@@ -143,13 +143,15 @@ static void hsw_crt_get_config(struct intel_encoder *encoder,/* Note: The caller is required to filter out dpms modes not supported by the * platform. */ -static void intel_crt_set_dpms (struct intel_encoder *encoder,int mode) +static void intel_crt_set_dpms (struct intel_encoder *encoder, +struct intel_crtc_state *crtc_state, +int mode) {struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crt *crt =intel_encoder_to_crt (encoder); -struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); -const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +const struct drm_display_mode *adjusted_mode = &crtc_state->base.adjusted_mode;u32 adpa;if (INTEL_INFO (dev)->gen >=5 )
@@ -197,7 +199,7 @@ static void intel_disable_crt(struct intel_encoder *encoder,struct intel_crtc_state *old_crtc_state, struct drm_connector_state *old_conn_state) { -intel_crt_set_dpms (encoder ,DRM_MODE_DPMS_OFF ); +intel_crt_set_dpms (encoder ,old_crtc_state ,DRM_MODE_DPMS_OFF ); } static void pch_disable_crt(struct intel_encoder *encoder,
@@ -217,7 +219,7 @@ static void intel_enable_crt(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { -intel_crt_set_dpms (encoder ,DRM_MODE_DPMS_ON ); +intel_crt_set_dpms (encoder ,pipe_config ,DRM_MODE_DPMS_ON ); } static enum drm_mode_status
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/15 drm/i915: Convert intel_dvo to use atomic state
In reply to Maarten Lankhorst--- drivers/gpu/drm/i915/intel_dvo.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_dvo.c +5 -7
@@ -194,13 +194,12 @@ static void intel_enable_dvo(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dvo *intel_dvo =enc_to_dvo (encoder); -struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc);i915_reg_t dvo_reg = intel_dvo->dev.dvo_reg;u32 temp =I915_READ (dvo_reg); intel_dvo->dev.dev_ops->mode_set (&intel_dvo->dev, - &crtc->config->base.mode, - &crtc->config->base.adjusted_mode); + &pipe_config->base.mode, + &pipe_config->base.adjusted_mode);I915_WRITE (dvo_reg, temp |DVO_ENABLE );I915_READ (dvo_reg);
@@ -262,10 +261,9 @@ static void intel_dvo_pre_enable(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { - struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); -const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode; + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); +const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;struct intel_dvo *intel_dvo =enc_to_dvo (encoder);int pipe = crtc->pipe;u32 dvo_val;
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 10/15 drm/i915: Convert intel_dsi to use atomic state
In reply to Maarten Lankhorst--- drivers/gpu/drm/i915/intel_dsi.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/intel_dsi.c +11 -11
@@ -534,16 +534,15 @@ static void intel_dsi_enable(struct intel_encoder *encoder)intel_panel_enable_backlight (intel_dsi->attached_connector); } -static void intel_dsi_prepare (struct intel_encoder *intel_encoder); +static void intel_dsi_prepare (struct intel_encoder *intel_encoder, +struct intel_crtc_state *pipe_config);static void intel_dsi_pre_enable (struct intel_encoder *encoder,struct intel_crtc_state *pipe_config,struct drm_connector_state *conn_state) { -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base); -struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc);enum port port;DRM_DEBUG_KMS ("\n" );
@@ -553,9 +552,9 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder,* lock. It needs to be fully powered down to fix it. */ intel_disable_dsi_pll (encoder); -intel_enable_dsi_pll (encoder, crtc->config); +intel_enable_dsi_pll (encoder, pipe_config); -intel_dsi_prepare (encoder); +intel_dsi_prepare (encoder, pipe_config);/* Panel Enable over CRC PMIC */ if (intel_dsi->gpio_panel)
@@ -829,7 +828,7 @@ static void bxt_dsi_get_pipe_config(struct intel_encoder *encoder, crtc_hblank_start_sw, crtc_hblank_end_sw; intel_crtc =to_intel_crtc (encoder->base.crtc); - adjusted_mode_sw = &intel_crtc->config->base.adjusted_mode; + adjusted_mode_sw = &pipe_config->base.adjusted_mode;/* * Atleast one port is active as encoder->get_config called only if
@@ -1113,14 +1112,15 @@ static u32 pixel_format_to_reg(enum mipi_dsi_pixel_format fmt) } } -static void intel_dsi_prepare (struct intel_encoder *intel_encoder) +static void intel_dsi_prepare (struct intel_encoder *intel_encoder, +struct intel_crtc_state *pipe_config) {struct drm_encoder *encoder = &intel_encoder->base;struct drm_device *dev = encoder->dev;struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *intel_crtc =to_intel_crtc (encoder->crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder); -const struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode; +const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;enum port port;unsigned int bpp =mipi_dsi_pixel_format_to_bpp (intel_dsi->pixel_format);u32 val, tmp;
@@ -1357,7 +1357,7 @@ static int intel_dsi_set_property(struct drm_connector *connector, intel_connector->panel.fitting_mode = val; } - crtc =intel_attached_encoder (connector)->base.crtc; + crtc = connector->state->crtc;if (crtc && crtc->state->enable) {/* * If the CRTC is enabled, the display will be changed
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 11/15 drm/i915: Convert intel_sdvo to use atomic state
In reply to Maarten Lankhorst--- drivers/gpu/drm/i915/intel_sdvo.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/intel_sdvo.c +11 -16
@@ -1003,24 +1003,22 @@ static bool intel_sdvo_write_infoframe(struct intel_sdvo *intel_sdvo, }static bool intel_sdvo_set_avi_infoframe (struct intel_sdvo *intel_sdvo, -const struct drm_display_mode *adjusted_mode) +struct intel_crtc_state *pipe_config) {uint8_t sdvo_data[HDMI_INFOFRAME_SIZE (AVI )]; -struct drm_crtc *crtc = intel_sdvo->base.base.crtc; -struct intel_crtc *intel_crtc =to_intel_crtc (crtc);union hdmi_infoframe frame;int ret;ssize_t len; ret =drm_hdmi_avi_infoframe_from_display_mode (&frame.avi, - adjusted_mode); + &pipe_config->base.adjusted_mode);if (ret <0 ) {DRM_ERROR ("couldn't fill AVI infoframe\n" );return false; }if (intel_sdvo->rgb_quant_range_selectable) { -if (intel_crtc->config->limited_color_range) +if (pipe_config->limited_color_range) frame.avi.quantization_range =HDMI_QUANTIZATION_RANGE_LIMITED ;else
@@ -1199,18 +1197,15 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder, {struct drm_device *dev = intel_encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *crtc =to_intel_crtc (intel_encoder->base.crtc); -const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode; -struct drm_display_mode *mode = &crtc->config->base.mode; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +const struct drm_display_mode *adjusted_mode = &crtc_state->base.adjusted_mode; +struct drm_display_mode *mode = &crtc_state->base.mode;struct intel_sdvo *intel_sdvo =to_sdvo (intel_encoder);u32 sdvox;struct intel_sdvo_in_out_map in_out;struct intel_sdvo_dtd input_dtd, output_dtd;int rate; -if (!mode) -return ; -/* First, set the input mapping for the first input to our controlled * output. This is only correct if we're a single-input device, in * which case the first input is the output from the appropriate SDVO
@@ -1243,11 +1238,11 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder,if (!intel_sdvo_set_target_input (intel_sdvo))return ; -if (crtc->config->has_hdmi_sink) { +if (crtc_state->has_hdmi_sink) {intel_sdvo_set_encode (intel_sdvo,SDVO_ENCODE_HDMI );intel_sdvo_set_colorimetry (intel_sdvo,SDVO_COLORIMETRY_RGB256 ); -intel_sdvo_set_avi_infoframe (intel_sdvo, adjusted_mode); +intel_sdvo_set_avi_infoframe (intel_sdvo, crtc_state); }else intel_sdvo_set_encode (intel_sdvo,SDVO_ENCODE_DVI );
@@ -1263,7 +1258,7 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder,DRM_INFO ("Setting input timings on %s failed\n" ,SDVO_NAME (intel_sdvo)); -switch (crtc->config->pixel_multiplier) { +switch (crtc_state->pixel_multiplier) {default :WARN (1 ,"unknown pixel multiplier specified\n" );case 1 : rate =SDVO_CLOCK_RATE_MULT_1X ;break ;
@@ -1278,7 +1273,7 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder,/* The real mode polarity is set by the SDVO commands, using * struct intel_sdvo_dtd. */ sdvox =SDVO_VSYNC_ACTIVE_HIGH |SDVO_HSYNC_ACTIVE_HIGH ; -if (!HAS_PCH_SPLIT (dev) && crtc->config->limited_color_range) +if (!HAS_PCH_SPLIT (dev) && crtc_state->limited_color_range) sdvox |=HDMI_COLOR_RANGE_16_235 ;if (INTEL_INFO (dev)->gen <5 ) sdvox |=SDVO_BORDER_ENABLE ;
@@ -1304,7 +1299,7 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder, }else if (IS_I945G (dev) ||IS_I945GM (dev) ||IS_G33 (dev)) {/* done in crtc_mode_set as it lives inside the dpll register */ }else { - sdvox |= (crtc->config->pixel_multiplier -1 ) + sdvox |= (crtc_state->pixel_multiplier -1 ) <<SDVO_PORT_MULTIPLY_SHIFT ; }
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 12/15 drm/i915: Convert intel_lvds to use atomic state
In reply to Maarten Lankhorst--- drivers/gpu/drm/i915/intel_lvds.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/intel_lvds.c +10 -12
@@ -141,17 +141,16 @@ static void intel_pre_enable_lvds(struct intel_encoder *encoder, struct drm_connector_state *conn_state) {struct intel_lvds_encoder *lvds_encoder =to_lvds_encoder (&encoder->base); -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); -const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode; +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); +const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;int pipe = crtc->pipe;u32 temp; -if (HAS_PCH_SPLIT (dev)) { +if (HAS_PCH_SPLIT (dev_priv)) {assert_fdi_rx_pll_disabled (dev_priv, pipe);assert_shared_dpll_disabled (dev_priv, - crtc->config->shared_dpll); + pipe_config->shared_dpll); }else {assert_pll_disabled (dev_priv, pipe); }
@@ -159,7 +158,7 @@ static void intel_pre_enable_lvds(struct intel_encoder *encoder, temp =I915_READ (lvds_encoder->reg); temp |=LVDS_PORT_EN |LVDS_A0A2_CLKA_POWER_UP ; -if (HAS_PCH_CPT (dev)) { +if (HAS_PCH_CPT (dev_priv)) { temp &= ~PORT_TRANS_SEL_MASK ; temp |=PORT_TRANS_SEL_CPT (pipe); }else {
@@ -172,7 +171,7 @@ static void intel_pre_enable_lvds(struct intel_encoder *encoder,/* set the corresponsding LVDS_BORDER bit */ temp &= ~LVDS_BORDER_ENABLE ; - temp |= crtc->config->gmch_pfit.lvds_border_bits; + temp |= pipe_config->gmch_pfit.lvds_border_bits;/* Set the B0-B3 data pairs corresponding to whether we're going to * set the DPLLs for dual-channel mode or not. */
@@ -195,7 +194,7 @@ static void intel_pre_enable_lvds(struct intel_encoder *encoder,if (IS_GEN4 (dev_priv)) {/* Bspec wording suggests that LVDS port dithering only exists * for 18bpp panels. */ -if (crtc->config->dither && crtc->config->pipe_bpp ==18 ) +if (pipe_config->dither && pipe_config->pipe_bpp ==18 ) temp |=LVDS_ENABLE_DITHER ;else temp &= ~LVDS_ENABLE_DITHER ;
@@ -245,12 +244,11 @@ static void intel_disable_lvds(struct intel_encoder *encoder,struct intel_crtc_state *old_crtc_state, struct drm_connector_state *old_conn_state) { - struct drm_device *dev = encoder->base.dev; struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);i915_reg_t ctl_reg, stat_reg; -if (HAS_PCH_SPLIT (dev)) { +if (HAS_PCH_SPLIT (dev_priv)) { ctl_reg =PCH_PP_CONTROL ; stat_reg =PCH_PP_STATUS ; }else {
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 13/15 drm/i915: Convert intel_dp_mst to use atomic state
In reply to Maarten Lankhorst--- drivers/gpu/drm/i915/intel_dp_mst.c | 48 ++++++++++++++----------------------- 1 file changed, 18 insertions(+), 30 deletions(-)
drivers/gpu/drm/i915/intel_dp_mst.c +18 -30
@@ -82,11 +82,13 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder,struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_digital_port *intel_dig_port = intel_mst->primary;struct intel_dp *intel_dp = &intel_dig_port->dp; +struct intel_connector *connector = +to_intel_connector (old_conn_state->connector);int ret;DRM_DEBUG_KMS ("%d\n" , intel_dp->active_mst_links); -drm_dp_mst_reset_vcpi_slots (&intel_dp->mst_mgr, intel_mst->connector->port); +drm_dp_mst_reset_vcpi_slots (&intel_dp->mst_mgr, connector->port); ret =drm_dp_update_payload_part1 (&intel_dp->mst_mgr);if (ret) {
@@ -101,6 +103,8 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder,struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_digital_port *intel_dig_port = intel_mst->primary;struct intel_dp *intel_dp = &intel_dig_port->dp; +struct intel_connector *connector = +to_intel_connector (old_conn_state->connector);DRM_DEBUG_KMS ("%d\n" , intel_dp->active_mst_links);
@@ -109,7 +113,7 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder,/* and this can also fail */ drm_dp_update_payload_part2 (&intel_dp->mst_mgr); -drm_dp_mst_deallocate_vcpi (&intel_dp->mst_mgr, intel_mst->connector->port); +drm_dp_mst_deallocate_vcpi (&intel_dp->mst_mgr, connector->port); intel_dp->active_mst_links--;
@@ -129,43 +133,29 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder,struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_digital_port *intel_dig_port = intel_mst->primary;struct intel_dp *intel_dp = &intel_dig_port->dp; -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);enum port port = intel_dig_port->port; +struct intel_connector *connector = +to_intel_connector (conn_state->connector);int ret;uint32_t temp; -struct intel_connector *found =NULL , *connector;int slots; -struct drm_crtc *crtc = encoder->base.crtc; -struct intel_crtc *intel_crtc =to_intel_crtc (crtc); - -for_each_intel_connector (dev, connector) { -if (connector->base.state->best_encoder == &encoder->base) { - found = connector; -break ; - } - } - -if (!found) { -DRM_ERROR ("can't find connector\n" ); -return ; - }/* MST encoders are bound to a crtc, not to a connector, * force the mapping here for get_hw_state. */ - found->encoder = encoder; + connector->encoder = encoder;DRM_DEBUG_KMS ("%d\n" , intel_dp->active_mst_links); - intel_mst->connector = found; + intel_mst->connector = connector;if (intel_dp->active_mst_links ==0 ) {intel_prepare_ddi_buffer (&intel_dig_port->base); -intel_ddi_clk_select (&intel_dig_port->base, intel_crtc->config); +intel_ddi_clk_select (&intel_dig_port->base, pipe_config); -intel_dp_set_link_params (intel_dp, intel_crtc->config); +intel_dp_set_link_params (intel_dp, pipe_config);intel_ddi_init_dp_buf_reg (&intel_dig_port->base);
@@ -176,8 +166,8 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder, } ret =drm_dp_mst_allocate_vcpi (&intel_dp->mst_mgr, - intel_mst->connector->port, - intel_crtc->config->pbn, &slots); + connector->port, + pipe_config->pbn, &slots);if (ret == false) {DRM_ERROR ("failed to allocate vcpi\n" );return ;
@@ -198,8 +188,7 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder,struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_digital_port *intel_dig_port = intel_mst->primary;struct intel_dp *intel_dp = &intel_dig_port->dp; -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);enum port port = intel_dig_port->port;int ret;
@@ -232,9 +221,8 @@ static void intel_dp_mst_enc_get_config(struct intel_encoder *encoder, {struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_digital_port *intel_dig_port = intel_mst->primary; -struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;u32 temp, flags =0 ;
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 14/15 drm/i915: Convert intel_dp to use atomic state
In reply to Maarten LankhorstSlightly less straightforward. Some of the drrs calls are done from workers or from intel_ddi.c, pass along crtc_state when we can, or crtc->config when we can't.
--- drivers/gpu/drm/i915/intel_ddi.c | 4 +- drivers/gpu/drm/i915/intel_dp.c | 125 ++++++++++++++++++--------------------- drivers/gpu/drm/i915/intel_drv.h | 6 +- 3 files changed, 65 insertions(+), 70 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +2 -2
@@ -1726,7 +1726,7 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder,intel_edp_backlight_on (intel_dp);intel_psr_enable (intel_dp); -intel_edp_drrs_enable (intel_dp); +intel_edp_drrs_enable (intel_dp, pipe_config); }if (intel_crtc->config->has_audio) {
@@ -1754,7 +1754,7 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder,if (type ==INTEL_OUTPUT_EDP ) {struct intel_dp *intel_dp =enc_to_intel_dp (encoder); -intel_edp_drrs_disable (intel_dp); +intel_edp_drrs_disable (intel_dp, old_crtc_state);intel_psr_disable (intel_dp);intel_edp_backlight_off (intel_dp); }
drivers/gpu/drm/i915/intel_dp.c +59 -66
349 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +4 -2
@@ -1397,8 +1397,10 @@ void intel_dp_hot_plug(struct intel_encoder *intel_encoder);void intel_power_sequencer_reset (struct drm_i915_private *dev_priv);uint32_t intel_dp_pack_aux (const uint8_t *src,int src_bytes);void intel_plane_destroy (struct drm_plane *plane); -void intel_edp_drrs_enable (struct intel_dp *intel_dp); -void intel_edp_drrs_disable (struct intel_dp *intel_dp); +void intel_edp_drrs_enable (struct intel_dp *intel_dp, +struct intel_crtc_state *crtc_state); +void intel_edp_drrs_disable (struct intel_dp *intel_dp, +struct intel_crtc_state *crtc_state);void intel_edp_drrs_invalidate (struct drm_device *dev,unsigned frontbuffer_bits);void intel_edp_drrs_flush (struct drm_device *dev,unsigned frontbuffer_bits);
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 15/15 drm/i915: Use more atomic state in intel_color.c
In reply to Maarten Lankhorstcrtc_state is already passed around, use it instead of crtc->config.
--- drivers/gpu/drm/i915/intel_color.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_color.c +14 -10
@@ -100,13 +100,14 @@ static void i9xx_load_csc_matrix(struct drm_crtc_state *crtc_state)struct intel_crtc *intel_crtc =to_intel_crtc (crtc);int i, pipe = intel_crtc->pipe;uint16_t coeffs[9 ] = {0 , }; +struct intel_crtc_state *intel_crtc_state =to_intel_crtc_state (crtc_state);if (crtc_state->ctm) {struct drm_color_ctm *ctm = (struct drm_color_ctm *)crtc_state->ctm->data;uint64_t input[9 ] = {0 , }; -if (intel_crtc->config->limited_color_range) { +if (intel_crtc_state->limited_color_range) {ctm_mult_by_limited (input, ctm->matrix); }else {for (i =0 ; i <ARRAY_SIZE (input); i++)
@@ -158,7 +159,7 @@ static void i9xx_load_csc_matrix(struct drm_crtc_state *crtc_state)* into consideration. */ for (i =0 ; i <3 ; i++) { -if (intel_crtc->config->limited_color_range) +if (intel_crtc_state->limited_color_range) coeffs[i *3 + i] =I9XX_CSC_COEFF_LIMITED_RANGE ;else
@@ -182,7 +183,7 @@ static void i9xx_load_csc_matrix(struct drm_crtc_state *crtc_state)if (INTEL_INFO (dev)->gen >6 ) {uint16_t postoff =0 ; -if (intel_crtc->config->limited_color_range) +if (intel_crtc_state->limited_color_range) postoff = (16 * (1 <<12 ) /255 ) &0x1fff ;I915_WRITE (PIPE_CSC_POSTOFF_HI (pipe), postoff);
@@ -193,7 +194,7 @@ static void i9xx_load_csc_matrix(struct drm_crtc_state *crtc_state) }else {uint32_t mode =CSC_MODE_YUV_TO_RGB ; -if (intel_crtc->config->limited_color_range) +if (intel_crtc_state->limited_color_range) mode |=CSC_BLACK_SCREEN_OFFSET ;I915_WRITE (PIPE_CSC_MODE (pipe), mode);
@@ -263,7 +264,8 @@ void intel_color_set_csc(struct drm_crtc_state *crtc_state)/* Loads the legacy palette/gamma unit for the CRTC. */ static void i9xx_load_luts_internal (struct drm_crtc *crtc, -struct drm_property_blob *blob) +struct drm_property_blob *blob, +struct intel_crtc_state *crtc_state) {struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -272,7 +274,7 @@ static void i9xx_load_luts_internal(struct drm_crtc *crtc,int i;if (HAS_GMCH_DISPLAY (dev)) { -if (intel_crtc_has_type (intel_crtc->config,INTEL_OUTPUT_DSI )) +if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_DSI ))assert_dsi_pll_enabled (dev_priv);else assert_pll_enabled (dev_priv, pipe);
@@ -305,7 +307,8 @@ static void i9xx_load_luts_internal(struct drm_crtc *crtc,static void i9xx_load_luts (struct drm_crtc_state *crtc_state) { -i9xx_load_luts_internal (crtc_state->crtc, crtc_state->gamma_lut); +i9xx_load_luts_internal (crtc_state->crtc, crtc_state->gamma_lut, +to_intel_crtc_state (crtc_state)); }/* Loads the legacy palette/gamma unit for the CRTC on Haswell. */
@@ -323,7 +326,7 @@ static void haswell_load_luts(struct drm_crtc_state *crtc_state)* Workaround : Do not read or write the pipe palette/gamma data while * GAMMA_MODE is configured for split gamma and IPS_CTL has IPS enabled. */ -if (IS_HASWELL (dev) && intel_crtc->config->ips_enabled && +if (IS_HASWELL (dev) && intel_crtc_state->ips_enabled && (intel_crtc_state->gamma_mode ==GAMMA_MODE_MODE_SPLIT )) {hsw_disable_ips (intel_crtc); reenable_ips = true;
@@ -436,7 +439,8 @@ static void cherryview_load_luts(struct drm_crtc_state *state)/* Turn off degamma/gamma on CGM block. */ I915_WRITE (CGM_PIPE_MODE (pipe), (state->ctm ?CGM_PIPE_MODE_CSC :0 )); -i9xx_load_luts_internal (crtc, state->gamma_lut); +i9xx_load_luts_internal (crtc, state->gamma_lut, +to_intel_crtc_state (state));return ; }
@@ -479,7 +483,7 @@ static void cherryview_load_luts(struct drm_crtc_state *state)* Also program a linear LUT in the legacy block (behind the * CGM block). */ -i9xx_load_luts_internal (crtc,NULL ); +i9xx_load_luts_internal (crtc,NULL ,to_intel_crtc_state (state)); }void intel_color_load_luts (struct drm_crtc_state *crtc_state)
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Ro.CI.BAT: warning for series starting with [01/15] drm/i915: handle DP_MST correctly in bxt_get_dpll
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: series starting with [01/15] drm/i915: handle DP_MST correctly in bxt_get_dpll
URL : https://patchwork.freedesktop.org/series/9610/
State : warning
== Summary ==
Series 9610v1 Series without cover letter
http://patchwork.freedesktop.org/api/1.0/series/9610/revisions/1/mbox
Test gem_exec_suspend:
Subgroup basic-s3:
pass -> DMESG-WARN (ro-skl3-i5-6260u)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
dmesg-warn -> SKIP (ro-bdw-i7-5557U)fi-kbl-qkkr total:235 pass:163 dwarn:26 dfail:1 fail:4 skip:41 fi-skl-i5-6260u total:235 pass:207 dwarn:0 dfail:0 fail:2 skip:26 fi-skl-i7-6700k total:235 pass:193 dwarn:0 dfail:0 fail:2 skip:40 fi-snb-i7-2600 total:235 pass:179 dwarn:0 dfail:0 fail:2 skip:54 ro-bdw-i5-5250u total:229 pass:204 dwarn:1 dfail:1 fail:0 skip:23 ro-bdw-i7-5557U total:229 pass:204 dwarn:1 dfail:1 fail:0 skip:23 ro-bdw-i7-5600u total:229 pass:190 dwarn:0 dfail:1 fail:0 skip:38 ro-bsw-n3050 total:229 pass:177 dwarn:0 dfail:1 fail:2 skip:49 ro-byt-n2820 total:229 pass:180 dwarn:0 dfail:1 fail:3 skip:45 ro-hsw-i3-4010u total:229 pass:197 dwarn:0 dfail:1 fail:0 skip:31 ro-hsw-i7-4770r total:229 pass:197 dwarn:0 dfail:1 fail:0 skip:31 ro-ilk-i7-620lm total:229 pass:157 dwarn:0 dfail:1 fail:1 skip:70 ro-ilk1-i5-650 total:224 pass:157 dwarn:0 dfail:1 fail:1 skip:65 ro-ivb-i7-3770 total:229 pass:188 dwarn:0 dfail:1 fail:0 skip:40 ro-skl3-i5-6260u total:229 pass:207 dwarn:2 dfail:1 fail:0 skip:19 ro-snb-i7-2620M total:229 pass:179 dwarn:0 dfail:1 fail:1 skip:48
Results at /archive/results/CI_IGT_test/RO_Patchwork_1446/
d305a69 drm-intel-nightly: 2016y-07m-07d-10h-19m-12s UTC integration manifest 31f905e drm/i915: Use more atomic state in intel_color.c
e7af228 drm/i915: Convert intel_dp to use atomic state
177f035 drm/i915: Convert intel_dp_mst to use atomic state
77bb864 drm/i915: Convert intel_lvds to use atomic state
0fb921a drm/i915: Convert intel_sdvo to use atomic state
f0955bd drm/i915: Convert intel_dsi to use atomic state
12697bd drm/i915: Convert intel_dvo to use atomic state
8ac2396 drm/i915: Convert intel_crt to use atomic state
b0af56b drm/i915: Remove unused loop from intel_dp_mst_compute_config 8534b8c drm/i915: Make encoder->compute_config take the connector state 6e23aeb drm/i915: Pass crtc_state and connector_state to encoder functions 6b542cb drm/i915: Walk over encoders in crtc enable/disable using atomic state. b999358 drm/i915: Remove unused mode_set hook from encoder
5600777 drm/i915: Pass atomic state to crtc enable/disable functions 590b30b drm/i915: handle DP_MST correctly in bxt_get_dpll
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 22 lines · Maarten Lankhorst
No idea if it supports it, but this is the minimum required from
get_dpll.Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/intel_dpll_mgr.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_dpll_mgr.c +2
-1@@ -1535,7 +1535,8 @@ bxt_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state, vco = best_clock.vco; }else if (encoder->type ==INTEL_OUTPUT_DP || - encoder->type ==INTEL_OUTPUT_EDP ) { + encoder->type ==INTEL_OUTPUT_EDP || + encoder->type ==INTEL_OUTPUT_DP_MST ) {int i; clk_div = bxt_dp_clk_val[0 ];
drivers/gpu/drm/i915/intel_dpll_mgr.c bxt_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state, · line 1620
Quoted 10 lines
drivers/gpu/drm/i915/intel_dpll_mgr.c +6
-1@@ -1611,7 +1612,12 @@ bxt_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state, crtc_state->dpll_hw_state.pcsdw12 =LANESTAGGER_STRAP_OVRD | lanestagger; - intel_dig_port =enc_to_dig_port (&encoder->base); +if (encoder->type ==INTEL_OUTPUT_DP_MST ) { +struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base); + + intel_dig_port = intel_mst->primary; + }else + intel_dig_port =enc_to_dig_port (&encoder->base);
We still have intel_ddi_get_encoder_port(), so maybe use it?
Quoted 10 lines
drivers/gpu/drm/i915/intel_dpll_mgr.c +0
-0/* 1:1 mapping between ports and PLLs */ i = (enum intel_dpll_id ) intel_dig_port->port;Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx