Commit 699390f7 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Fix the PHY compliance test vs. hotplug mishap 



I accidentally added the compliance test hacks only to
intel_dp_hotplug() which doesn't even get used on any DDI
platform. Put the same crap into intel_ddi_hotplug().

Cc: Imre Deak <imre.deak@intel.com>
Fixes: 193af12c ("drm/i915: Shove the PHY test into the hotplug work")
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210114205046.8247-7-ville.syrjala@linux.intel.com


Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
parent 60920148

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

+8 −0
Original line number Diff line number Diff line
@@ -5195,12 +5195,20 @@ intel_ddi_hotplug(struct intel_encoder *encoder, 
{

	struct drm_i915_private *i915 = to_i915(encoder->base.dev);

	struct intel_digital_port *dig_port = enc_to_dig_port(encoder);

	struct intel_dp *intel_dp = &dig_port->dp;

	enum phy phy = intel_port_to_phy(i915, encoder->port);

	bool is_tc = intel_phy_is_tc(i915, phy);

	struct drm_modeset_acquire_ctx ctx;

	enum intel_hotplug_state state;

	int ret;



	if (intel_dp->compliance.test_active &&

	    intel_dp->compliance.test_type == DP_TEST_LINK_PHY_TEST_PATTERN) {

		intel_dp_phy_test(encoder);

		/* just do the PHY test and nothing else */

		return INTEL_HOTPLUG_UNCHANGED;

	}



	state = intel_encoder_hotplug(encoder, connector);



	drm_modeset_acquire_init(&ctx, 0);

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

+1 −1
Original line number Diff line number Diff line
@@ -5561,7 +5561,7 @@ static int intel_dp_do_phy_test(struct intel_encoder *encoder, 
	return 0;

}



static void intel_dp_phy_test(struct intel_encoder *encoder)

void intel_dp_phy_test(struct intel_encoder *encoder)

{

	struct drm_modeset_acquire_ctx ctx;

	int ret;

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

+1 −0
Original line number Diff line number Diff line
@@ -142,5 +142,6 @@ const struct dpll *vlv_get_dpll(struct drm_i915_private *i915); 
void intel_dp_check_frl_training(struct intel_dp *intel_dp);

void intel_dp_pcon_dsc_configure(struct intel_dp *intel_dp,

				 const struct intel_crtc_state *crtc_state);

void intel_dp_phy_test(struct intel_encoder *encoder);



#endif /* __INTEL_DP_H__ */