On Mon, Sep 18, 2017 at 05:31:28PM +0000, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Most of our DP encoder hooks are split into per-platform variants.
> .disable() an exception, and thus it's a bit messy. Let's split it
> up as well. We'll leave the common parts in a helper called by
> each platform specific hook.
>
> There is a subtle change on VLV/CHV where we now disable PSR before
> audio, whereas before we disabled PSR after audio. That should be
> totally fine, and PSR is disabled by default anyway.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_dp.c | 44 +++++++++++++++++++++++++++++++++--------
> 1 file changed, 36 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index d0ea9c4f87c8..dcdefd986569 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -2692,23 +2692,46 @@ static void intel_disable_dp(struct intel_encoder *encoder,
> const struct drm_connector_state *old_conn_state)
> {
> struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
> - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
>
> if (old_crtc_state->has_audio)
> intel_audio_codec_disable(encoder);
>
> - intel_psr_disable(intel_dp, old_crtc_state);
> -
> /* Make sure the panel is off before trying to change the mode. But also
> * ensure that we have vdd while we switch off the panel. */
> intel_edp_panel_vdd_on(intel_dp);
> intel_edp_backlight_off(old_conn_state);
> intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
> intel_edp_panel_off(intel_dp);
> +}
> +
> +static void g4x_disable_dp(struct intel_encoder *encoder,
> + const struct intel_crtc_state *old_crtc_state,
> + const struct drm_connector_state *old_conn_state)
> +{
> + struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
> +
> + intel_disable_dp(encoder, old_crtc_state, old_conn_state);
>
> /* disable the port before the pipe on g4x */
> - if (INTEL_GEN(dev_priv) < 5)
> - intel_dp_link_down(intel_dp);
> + intel_dp_link_down(intel_dp);
> +}
> +
> +static void ilk_disable_dp(struct intel_encoder *encoder,
> + const struct intel_crtc_state *old_crtc_state,
> + const struct drm_connector_state *old_conn_state)
> +{
> + intel_disable_dp(encoder, old_crtc_state, old_conn_state);
> +}
> +
> +static void vlv_disable_dp(struct intel_encoder *encoder,
> + const struct intel_crtc_state *old_crtc_state,
> + const struct drm_connector_state *old_conn_state)
> +{
> + struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
> +
> + intel_psr_disable(intel_dp, old_crtc_state);
oh! not it makes sense...
please move the that removal of !HAS_DDI from the first patch to this patch
and feel free to ad my rv-b on both patches.
> +
> + intel_disable_dp(encoder, old_crtc_state, old_conn_state);
> }
>
> static void ilk_post_disable_dp(struct intel_encoder *encoder,
> @@ -6144,7 +6167,6 @@ bool intel_dp_init(struct drm_i915_private *dev_priv,
> goto err_encoder_init;
>
> intel_encoder->compute_config = intel_dp_compute_config;
> - intel_encoder->disable = intel_disable_dp;
> intel_encoder->get_hw_state = intel_dp_get_hw_state;
> intel_encoder->get_config = intel_dp_get_config;
> intel_encoder->suspend = intel_dp_encoder_suspend;
> @@ -6152,18 +6174,24 @@ bool intel_dp_init(struct drm_i915_private *dev_priv,
> intel_encoder->pre_pll_enable = chv_dp_pre_pll_enable;
> intel_encoder->pre_enable = chv_pre_enable_dp;
> intel_encoder->enable = vlv_enable_dp;
> + intel_encoder->disable = vlv_disable_dp;
> intel_encoder->post_disable = chv_post_disable_dp;
> intel_encoder->post_pll_disable = chv_dp_post_pll_disable;
> } else if (IS_VALLEYVIEW(dev_priv)) {
> intel_encoder->pre_pll_enable = vlv_dp_pre_pll_enable;
> intel_encoder->pre_enable = vlv_pre_enable_dp;
> intel_encoder->enable = vlv_enable_dp;
> + intel_encoder->disable = vlv_disable_dp;
> intel_encoder->post_disable = vlv_post_disable_dp;
> + } else if (INTEL_GEN(dev_priv) >= 5) {
> + intel_encoder->pre_enable = g4x_pre_enable_dp;
> + intel_encoder->enable = g4x_enable_dp;
> + intel_encoder->disable = ilk_disable_dp;
> + intel_encoder->post_disable = ilk_post_disable_dp;
> } else {
> intel_encoder->pre_enable = g4x_pre_enable_dp;
> intel_encoder->enable = g4x_enable_dp;
> - if (INTEL_GEN(dev_priv) >= 5)
> - intel_encoder->post_disable = ilk_post_disable_dp;
> + intel_encoder->disable = g4x_disable_dp;
> }
>
> intel_dig_port->port = port;
> --
> 2.13.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
