[Intel-gfx] [PATCH v3 2/7] drm/atomic: Make add_affected_connectors look at crtc_state.

[Laurent Pinchart]

Hi Maarten,

Thank you for the patch.

On Monday 16 Jan 2017 10:37:39 Maarten Lankhorst wrote:
> This kills another dereference of connector->state. connector_mask
> holds all unchanged connectors at least and any changed connectors
> are already in state anyway.
> 
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

> ---
>  drivers/gpu/drm/drm_atomic.c | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
> index 1c1cbf436717..18cdf2c956c6 100644
> --- a/drivers/gpu/drm/drm_atomic.c
> +++ b/drivers/gpu/drm/drm_atomic.c
> @@ -1419,8 +1419,13 @@ drm_atomic_add_affected_connectors(struct
> drm_atomic_state *state, struct drm_connector *connector;
>  	struct drm_connector_state *conn_state;
>  	struct drm_connector_list_iter conn_iter;
> +	struct drm_crtc_state *crtc_state;
>  	int ret;
> 
> +	crtc_state = drm_atomic_get_crtc_state(state, crtc);
> +	if (IS_ERR(crtc_state))
> +		return PTR_ERR(crtc_state);
> +
>  	ret = drm_modeset_lock(&config->connection_mutex, state->acquire_ctx);
>  	if (ret)
>  		return ret;
> @@ -1429,12 +1434,12 @@ drm_atomic_add_affected_connectors(struct
> drm_atomic_state *state, crtc->base.id, crtc->name, state);
> 
>  	/*
> -	 * Changed connectors are already in @state, so only need to look at 
the
> -	 * current configuration.
> +	 * Changed connectors are already in @state, so only need to look
> +	 * at the connector_mask in crtc_state.
>  	 */
>  	drm_connector_list_iter_get(state->dev, &conn_iter);
>  	drm_for_each_connector_iter(connector, &conn_iter) {
> -		if (connector->state->crtc != crtc)
> +		if (!(crtc_state->connector_mask & (1 <<
> drm_connector_index(connector)))) continue;
> 
>  		conn_state = drm_atomic_get_connector_state(state, connector);

-- 
Regards,

Laurent Pinchart