Commit 78eaaba3 authored by José Roberto de Souza's avatar José Roberto de Souza
Browse files

drm/i915/display/mst: Move DPMS_OFF call to post_disable 



Moving just to simplify handling as there is no change in behavior.

Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191202222513.337777-3-jose.souza@intel.com
parent 50a7efb2

drivers/gpu/drm/i915/display/intel_ddi.c

+7 −7
Original line number Diff line number Diff line
@@ -3801,14 +3801,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);



	if (!is_mst)

		intel_ddi_disable_pipe_clock(old_crtc_state);

	}



	intel_disable_ddi_buf(encoder, old_crtc_state);

drivers/gpu/drm/i915/display/intel_dp_mst.c

+0 −1
Original line number Diff line number Diff line
@@ -256,7 +256,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);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE