[Intel-gfx] [PATCH 4/6] drm/crtc: take references to connectors used in a modeset. (v2)

[Daniel Vetter]

On Tue, May 03, 2016 at 02:28:24PM +1000, Dave Airlie wrote:
> From: Dave Airlie <airlied at redhat.com>
> 
> This just takes a reference on the connector when we set a mode
> in the non-atomic paths.
> 
> v2: Follow Daniel Stone's suggestions on when to take/drop
> references.
> 
> Signed-off-by: Dave Airlie <airlied at redhat.com>

I've already embarrassed myself once with a bonghits r-b, let's try this
again:

Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

> ---
>  drivers/gpu/drm/drm_crtc_helper.c | 19 +++++++++++++++++++
>  1 file changed, 19 insertions(+)
> 
> diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
> index 66ca313..f47a252 100644
> --- a/drivers/gpu/drm/drm_crtc_helper.c
> +++ b/drivers/gpu/drm/drm_crtc_helper.c
> @@ -456,6 +456,9 @@ drm_crtc_helper_disable(struct drm_crtc *crtc)
>  			 * between them is henceforth no longer available.
>  			 */
>  			connector->dpms = DRM_MODE_DPMS_OFF;
> +
> +			/* we keep a reference while the encoder is bound */
> +			drm_connector_unreference(connector);
>  		}
>  	}
>  
> @@ -606,6 +609,11 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
>  		mode_changed = true;
>  	}
>  
> +	/* take a reference on all connectors in set */
> +	for (ro = 0; ro < set->num_connectors; ro++) {
> +		drm_connector_reference(set->connectors[ro]);
> +	}
> +
>  	/* a) traverse passed in connector list and get encoders for them */
>  	count = 0;
>  	drm_for_each_connector(connector, dev) {
> @@ -724,6 +732,12 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
>  		}
>  	}
>  
> +	/* after fail drop reference on all connectors in save set */
> +	count = 0;
> +	drm_for_each_connector(connector, dev) {
> +		drm_connector_unreference(&save_connectors[count++]);
> +	}
> +
>  	kfree(save_connectors);
>  	kfree(save_encoders);
>  	return 0;
> @@ -740,6 +754,11 @@ fail:
>  		*connector = save_connectors[count++];
>  	}
>  
> +	/* after fail drop reference on all connectors in set */
> +	for (ro = 0; ro < set->num_connectors; ro++) {
> +		drm_connector_unreference(set->connectors[ro]);
> +	}
> +
>  	/* Try to restore the config */
>  	if (mode_changed &&
>  	    !drm_crtc_helper_set_mode(save_set.crtc, save_set.mode, save_set.x,
> -- 
> 2.5.5
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch