On Thu, Jan 14, 2021 at 10:50:45PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> 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@xxxxxxxxx>
> Fixes: 193af12cd681 ("drm/i915: Shove the PHY test into the hotplug work")
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Reviewed-by: Imre Deak <imre.deak@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_ddi.c | 8 ++++++++
> drivers/gpu/drm/i915/display/intel_dp.c | 2 +-
> drivers/gpu/drm/i915/display/intel_dp.h | 1 +
> 3 files changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index 4443a4ab722f..d7df1828a740 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -5204,12 +5204,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);
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index 30713816bf9d..349647f6bbb9 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -5522,7 +5522,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;
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.h b/drivers/gpu/drm/i915/display/intel_dp.h
> index 6a2c759ad46f..d42860ef4521 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.h
> +++ b/drivers/gpu/drm/i915/display/intel_dp.h
> @@ -137,5 +137,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__ */
> --
> 2.26.2
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
