[Intel-gfx] [PATCH 11/13] drm/i915: Get rid of crtc->config dereference in intel_dp_retrain_link

Ville Syrjälä ville.syrjala at linux.intel.com
Wed Oct 3 14:21:10 UTC 2018


On Wed, Oct 03, 2018 at 03:37:13PM +0200, Maarten Lankhorst wrote:
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_dp.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 15a981ef5966..d9cc52b2ba79 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -4417,7 +4417,7 @@ int intel_dp_retrain_link(struct intel_encoder *encoder,
>  
>  	/* Suppress underruns caused by re-training */
>  	intel_set_cpu_fifo_underrun_reporting(dev_priv, crtc->pipe, false);
> -	if (crtc->config->has_pch_encoder)
> +	if (crtc_state->has_pch_encoder)

Oh yes, we have a state now. Which means all the remaining ->config
usages in link training code should also be nukeable now? Mostly
down to some plumbing work perhaps?

Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

>  		intel_set_pch_fifo_underrun_reporting(dev_priv,
>  						      intel_crtc_pch_transcoder(crtc), false);
>  
> @@ -4428,7 +4428,7 @@ int intel_dp_retrain_link(struct intel_encoder *encoder,
>  	intel_wait_for_vblank(dev_priv, crtc->pipe);
>  
>  	intel_set_cpu_fifo_underrun_reporting(dev_priv, crtc->pipe, true);
> -	if (crtc->config->has_pch_encoder)
> +	if (crtc_state->has_pch_encoder)
>  		intel_set_pch_fifo_underrun_reporting(dev_priv,
>  						      intel_crtc_pch_transcoder(crtc), true);
>  
> -- 
> 2.19.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel


More information about the Intel-gfx mailing list