[Intel-gfx] [PATCH v2 2/2] drm/i915/mst: Continue state updates even if AUX writes fail.

Nathan Ciobanu nathan.d.ciobanu at linux.intel.com
Wed Jul 18 18:04:55 UTC 2018


On Wed, Jul 18, 2018 at 10:19:43AM -0700, Dhinakaran Pandiyan wrote:
> We are too late in the enabling sequence to back out cleanly, not updating
> state tracking variables, like intel_dp->active_mst_links in this
> instance, results in incorrect behaviour further along.
> 
> v2: Fixed int v/s bool comparison
> 
> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Cc: Nathan Ciobanu <nathan.d.ciobanu at linux.intel.com>
> Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan at intel.com>
Reviewed-by: Nathan Ciobanu <nathan.d.ciobanu at linux.intel.com>
Tested-by: Nathan Ciobanu <nathan.d.ciobanu at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_dp_mst.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
> index 7e3e01607643..110e7ff22ef7 100644
> --- a/drivers/gpu/drm/i915/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
> @@ -241,11 +241,8 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder,
>  				       connector->port,
>  				       pipe_config->pbn,
>  				       pipe_config->dp_m_n.tu);
> -	if (ret == false) {
> +	if (!ret)
>  		DRM_ERROR("failed to allocate vcpi\n");
> -		return;
> -	}
> -
>  
>  	intel_dp->active_mst_links++;
>  	temp = I915_READ(DP_TP_STATUS(port));
> -- 
> 2.17.1
> 


More information about the Intel-gfx mailing list