[Intel-gfx] [PATCH v2 09/12] drm/i915: Remove connectors_active from intel_dp.c.

[Ander Conselvan De Oliveira]

On Mon, 2015-07-27 at 14:35 +0200, Maarten Lankhorst wrote:
> Now that everything's atomic, checking encoder->base.crtc is enough.

Don't you need to check encoder->base.crtc->state->active too?

> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_dp.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index cea7d1785d13..dccd9a0e2526 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -2624,7 +2624,7 @@ static void vlv_steal_power_sequencer(struct drm_device *dev,
>  		DRM_DEBUG_KMS("stealing pipe %c power sequencer from port %c\n",
>  			      pipe_name(pipe), port_name(port));
>  
> -		WARN(encoder->connectors_active,
> +		WARN(encoder->base.crtc,
>  		     "stealing pipe %c power sequencer from active eDP port %c\n",
>  		     pipe_name(pipe), port_name(port));
>  
> @@ -4240,10 +4240,7 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)
>  
>  	WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
>  
> -	if (!intel_encoder->connectors_active)
> -		return;
> -
> -	if (WARN_ON(!intel_encoder->base.crtc))
> +	if (!intel_encoder->base.crtc)
>  		return;
>  
>  	if (!to_intel_crtc(intel_encoder->base.crtc)->active)