On Fri, Nov 22, 2019 at 04:54:57PM -0800, José Roberto de Souza wrote:
> Moving just to simplify handling as there is no change in behavior.
lgtm
Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Cc: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
> Signed-off-by: José Roberto de Souza <jose.souza@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_ddi.c | 14 +++++++-------
> drivers/gpu/drm/i915/display/intel_dp_mst.c | 1 -
> 2 files changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index 7d3a6e3c7f57..cfcaa7c81575 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -3807,14 +3807,14 @@ static void intel_ddi_post_disable_dp(struct intel_encoder *encoder,
> INTEL_OUTPUT_DP_MST);
> enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
>
> - if (!is_mst) {
> - /*
> - * Power down sink before disabling the port, otherwise we end
> - * up getting interrupts from the sink on detecting link loss.
> - */
> - intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
> + /*
> + * Power down sink before disabling the port, otherwise we end
> + * up getting interrupts from the sink on detecting link loss.
> + */
> + intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
> +
> + if (!is_mst)
> intel_ddi_disable_pipe_clock(old_crtc_state);
> - }
>
> intel_disable_ddi_buf(encoder, old_crtc_state);
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> index 9731c3c1d3f2..94549848653a 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> @@ -390,7 +390,6 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder,
>
> intel_mst->connector = NULL;
> if (intel_dp->active_mst_links == 0) {
> - intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
> intel_dig_port->base.post_disable(&intel_dig_port->base,
> old_crtc_state, NULL);
> intel_dp->mst_master_transcoder = INVALID_TRANSCODER;
> --
> 2.24.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
