On Tue, Aug 09, 2016 at 05:04:03PM +0200, Maarten Lankhorst wrote:
> This 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.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx>
Dunno why I missed that one, sorry.
Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_display.c | 190 ++++++++++++++++++++++++-----------
> 1 file changed, 134 insertions(+), 56 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index ae555b4240c6..821dff719ec8 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4694,6 +4694,123 @@ static void intel_crtc_disable_planes(struct drm_crtc *crtc, unsigned plane_mask
> intel_frontbuffer_flip(to_i915(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)
> {
> @@ -4701,7 +4818,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))
> @@ -4740,9 +4856,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
> @@ -4772,8 +4886,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);
> @@ -4798,7 +4911,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;
>
> @@ -4809,9 +4921,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);
> @@ -4849,10 +4959,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);
> @@ -4893,10 +5000,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);
> @@ -4937,7 +5041,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;
>
> /*
> @@ -4950,8 +5053,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);
> @@ -4963,9 +5065,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);
> @@ -5002,17 +5102,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);
> @@ -5035,9 +5131,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);
> @@ -6109,7 +6203,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))
> @@ -6134,9 +6227,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);
> @@ -6146,9 +6237,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);
>
> @@ -6160,8 +6249,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)
> @@ -6180,7 +6268,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))
> @@ -6201,9 +6288,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);
>
> @@ -6217,8 +6302,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)
> @@ -6243,7 +6327,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;
>
> /*
> @@ -6253,8 +6336,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);
> @@ -6263,9 +6345,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))
> @@ -6276,9 +6356,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);
> --
> 2.7.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
