Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5481c8fb authored by Daniel Vetter's avatar Daniel Vetter Committed by Jani Nikula
Browse files

drm/atomic-helper: Check encoder/crtc constraints 



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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Daniel Stone <daniels@collabora.com>
Reviewed-by: default avatarDaniel Stone <daniels@collabora.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1447868808-10266-1-git-send-email-daniel.vetter@ffwll.ch
parent 83926117

drivers/gpu/drm/drm_atomic_helper.c

+8 −0
Original line number Diff line number Diff line
@@ -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,