[Intel-gfx] [PATCH] drm/atomic-helper: Check encoder/crtc constraints

[Jani Nikula]

On Wed, 18 Nov 2015, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> This was totally lost when I originally created the atomic helpers.
>
> We probably should also check possible_clones in the helpers, but
> since the legacy ones didn't do that this is for a separate patch.
>
> Reported-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Cc: Daniel Stone <daniels at collabora.com>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>

Pushed to our topic/drm-fixes branch, thanks for the patch and review.

BR,
Jani.


> ---
>  drivers/gpu/drm/drm_atomic_helper.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index 0c6f62168776..cfdc9931b08a 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -210,6 +210,14 @@ update_connector_routing(struct drm_atomic_state *state, int conn_idx)
>  		return -EINVAL;
>  	}
>  
> +	if (!drm_encoder_crtc_ok(new_encoder, connector_state->crtc)) {
> +		DRM_DEBUG_ATOMIC("[ENCODER:%d:%s] incompatible with [CRTC:%d]\n",
> +				 new_encoder->base.id,
> +				 new_encoder->name,
> +				 connector_state->crtc->base.id);
> +		return -EINVAL;
> +	}
> +
>  	if (new_encoder == connector_state->best_encoder) {
>  		DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] keeps [ENCODER:%d:%s], now on [CRTC:%d]\n",
>  				 connector->base.id,

-- 
Jani Nikula, Intel Open Source Technology Center