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

Commit 14de6c44 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/atomic: Remove drm_atomic_connectors_for_crtc. 



Now that connector_mask is reliable there's no need for this
function any more.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1451908400-25147-6-git-send-email-maarten.lankhorst@linux.intel.com


Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 2aa974c9

drivers/gpu/drm/drm_atomic.c

+0 −30
Original line number Diff line number Diff line
@@ -1198,36 +1198,6 @@ drm_atomic_add_affected_planes(struct drm_atomic_state *state, 
}

EXPORT_SYMBOL(drm_atomic_add_affected_planes);



/**

 * drm_atomic_connectors_for_crtc - count number of connected outputs

 * @state: atomic state

 * @crtc: DRM crtc

 *

 * This function counts all connectors which will be connected to @crtc

 * according to @state. Useful to recompute the enable state for @crtc.

 */

int

drm_atomic_connectors_for_crtc(struct drm_atomic_state *state,

			       struct drm_crtc *crtc)

{

	struct drm_connector *connector;

	struct drm_connector_state *conn_state;



	int i, num_connected_connectors = 0;



	for_each_connector_in_state(state, connector, conn_state, i) {

		if (conn_state->crtc == crtc)

			num_connected_connectors++;

	}



	DRM_DEBUG_ATOMIC("State %p has %i connectors for [CRTC:%d:%s]\n",

			 state, num_connected_connectors,

			 crtc->base.id, crtc->name);



	return num_connected_connectors;

}

EXPORT_SYMBOL(drm_atomic_connectors_for_crtc);



/**

 * drm_atomic_legacy_backoff - locking backoff for legacy ioctls

 * @state: atomic state

drivers/gpu/drm/drm_atomic_helper.c

+4 −6
Original line number Diff line number Diff line
@@ -463,7 +463,8 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, 
	 * crtc only changed its mode but has the same set of connectors.

	 */

	for_each_crtc_in_state(state, crtc, crtc_state, i) {

		int num_connectors;

		bool has_connectors =

			!!crtc_state->connector_mask;



		/*

		 * We must set ->active_changed after walking connectors for
@@ -492,10 +493,7 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, 
		if (ret != 0)

			return ret;



		num_connectors = drm_atomic_connectors_for_crtc(state,

								crtc);



		if (crtc_state->enable != !!num_connectors) {

		if (crtc_state->enable != has_connectors) {

			DRM_DEBUG_ATOMIC("[CRTC:%d:%s] enabled/connectors mismatch\n",

					 crtc->base.id, crtc->name);
@@ -1754,7 +1752,7 @@ static int update_output_state(struct drm_atomic_state *state, 
		if (crtc == set->crtc)

			continue;



		if (!drm_atomic_connectors_for_crtc(state, crtc)) {

		if (!crtc_state->connector_mask) {

			ret = drm_atomic_set_mode_prop_for_crtc(crtc_state,

								NULL);

			if (ret < 0)

drivers/gpu/drm/vc4/vc4_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ static int vc4_crtc_atomic_check(struct drm_crtc *crtc, 
	/* The pixelvalve can only feed one encoder (and encoders are

	 * 1:1 with connectors.)

	 */

	if (drm_atomic_connectors_for_crtc(state->state, crtc) > 1)

	if (hweight32(state->connector_mask) > 1)

		return -EINVAL;



	drm_atomic_crtc_state_for_each_plane(plane, state) {

include/drm/drm_atomic.h

+0 −4
Original line number Diff line number Diff line
@@ -130,10 +130,6 @@ int __must_check 
drm_atomic_add_affected_planes(struct drm_atomic_state *state,

			       struct drm_crtc *crtc);



int

drm_atomic_connectors_for_crtc(struct drm_atomic_state *state,

			       struct drm_crtc *crtc);



void drm_atomic_legacy_backoff(struct drm_atomic_state *state);



void