drm/i915: Move the lspcon resume from .reset() to intel_dp_sink_dpms() (0a5a7499) · Commits · 戴 / test

Rather that try to trick LSPCON back into PCON mode from the .reset() hook let's just do that as a regular part of the normal modeset sequence, which is going to take care of the system resume case. During a normal modeset this should normally be a nop as the mode should have already been switched by .detect(). Signed-off-by:

Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20201016194800.25581-1-ville.syrjala@linux.intel.com Reviewed-by:

Imre Deak <imre.deak@intel.com>

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -3490,6 +3490,8 @@ void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode)
		} else {
		struct intel_lspcon *lspcon = dp_to_lspcon(intel_dp);

		lspcon_resume(dp_to_dig_port(intel_dp));

		/*
		* When turning on, we need to retry for 1ms to give the sink
		* time to wake up.
		@@ -6782,14 +6784,11 @@ void intel_dp_encoder_reset(struct drm_encoder *encoder)
		{
		struct drm_i915_private *dev_priv = to_i915(encoder->dev);
		struct intel_dp *intel_dp = enc_to_intel_dp(to_intel_encoder(encoder));
		struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
		intel_wakeref_t wakeref;

		if (!HAS_DDI(dev_priv))
		intel_dp->DP = intel_de_read(dev_priv, intel_dp->output_reg);

		lspcon_resume(dig_port);

		intel_dp->reset_link_params = true;

		if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv) &&

Admin message