drm/atomic-helper: Drop unneeded argument from check_pending_encoder (07bad49e) · Commits · 戴 / test

Just a remnant from an old iteration of this patch that I've forgotten to remove: We only need the encoder to figure out whether it has been reassigned in this update already or not to figure out whether there's a conflict or not. Reported-by:

Thierry Reding <thierry.reding@gmail.com> Cc: Thierry Reding <thierry.reding@gmail.com> Link: http://patchwork.freedesktop.org/patch/msgid/1449564561-3896-2-git-send-email-daniel.vetter@ffwll.ch Reviewed-by:

Thierry Reding <treding@nvidia.com> Signed-off-by:

Daniel Vetter <daniel.vetter@intel.com>

drivers/gpu/drm/drm_atomic_helper.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -88,8 +88,7 @@ drm_atomic_helper_plane_changed(struct drm_atomic_state *state,

		static bool
		check_pending_encoder_assignment(struct drm_atomic_state *state,
		struct drm_encoder *new_encoder,
		struct drm_connector *new_connector)
		struct drm_encoder *new_encoder)
		{
		struct drm_connector *connector;
		struct drm_connector_state *conn_state;
		@@ -257,7 +256,7 @@ update_connector_routing(struct drm_atomic_state *state, int conn_idx)
		return 0;
		}

		if (!check_pending_encoder_assignment(state, new_encoder, connector)) {
		if (!check_pending_encoder_assignment(state, new_encoder)) {
		DRM_DEBUG_ATOMIC("Encoder for [CONNECTOR:%d:%s] already assigned\n",
		connector->base.id,
		connector->name);

Admin message