[Intel-gfx] [PATCH] drm/i915/mst: fix pipe and vblank enable

Jani Nikula jani.nikula at intel.com
Mon Feb 10 11:32:06 UTC 2020


On Wed, 05 Feb 2020, Jani Nikula <jani.nikula at intel.com> wrote:
> Commit 21fd23ac222f ("drm/i915: move pipe, pch and vblank enable to
> encoders on DDI platforms") pushed pipe and vblank enable to encoders on
> DDI platforms, however it missed the DP MST encoder. Fix it.
>
> Fixes: 21fd23ac222f ("drm/i915: move pipe, pch and vblank enable to encoders on DDI platforms")
> Cc: Vandita Kulkarni <vandita.kulkarni at intel.com>
> Cc: Ville Syrjala <ville.syrjala at linux.intel.com>
> Reported-by: Stanislav Lisovskiy <stanislav.lisovskiy at intel.com>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

Thanks for the reviews and testing, pushed to dinq.

I don't usually cut corners, but I've made an exception and pushed this
without full IGT results.

It's been 5 days since the patch was posted, the sharded run has fallen
between the cracks, and the queue is currently about three days. IMHO
it's intolerable for any patch, but especially so for a regression fix
that was posted within hours of the bug report.

BR,
Jani.


> ---
>  drivers/gpu/drm/i915/display/intel_dp_mst.c | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> index b8aee506d595..9cd59141953d 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> @@ -491,6 +491,12 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder,
>  	struct intel_dp *intel_dp = &intel_dig_port->dp;
>  	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
>  
> +	drm_WARN_ON(&dev_priv->drm, pipe_config->has_pch_encoder);
> +
> +	intel_enable_pipe(pipe_config);
> +
> +	intel_crtc_vblank_on(pipe_config);
> +
>  	DRM_DEBUG_KMS("active links %d\n", intel_dp->active_mst_links);
>  
>  	if (intel_de_wait_for_set(dev_priv, intel_dp->regs.dp_tp_status,

-- 
Jani Nikula, Intel Open Source Graphics Center


More information about the Intel-gfx mailing list