Commit 6e22dc35 authored by Claudio Suarez's avatar Claudio Suarez Committed by Daniel Vetter
Browse files

drm: get rid of DRM_DEBUG_* log calls in drm core, files drm_a*.c 



DRM_DEBUG_* and DRM_* log calls are deprecated.
Change them to drm_dbg_* / drm_{err,info,...} calls in drm core
files.

To avoid making a very big patch, this change is split in
smaller patches. This one includes drm_a*.c

Signed-off-by: default avatarClaudio Suarez <cssk@net-c.es>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/YaC7zXW119tlzfVh@gineta.localdomain
parent 11632d4a

drivers/gpu/drm/drm_atomic.c

+99 −81
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ int drm_crtc_commit_wait(struct drm_crtc_commit *commit) 


	ret = wait_for_completion_timeout(&commit->hw_done, timeout);

	if (!ret) {

		DRM_ERROR("hw_done timed out\n");

		drm_err(commit->crtc->dev, "hw_done timed out\n");

		return -ETIMEDOUT;

	}
@@ -84,7 +84,7 @@ int drm_crtc_commit_wait(struct drm_crtc_commit *commit) 
	 */

	ret = wait_for_completion_timeout(&commit->flip_done, timeout);

	if (!ret) {

		DRM_ERROR("flip_done timed out\n");

		drm_err(commit->crtc->dev, "flip_done timed out\n");

		return -ETIMEDOUT;

	}
@@ -140,7 +140,7 @@ drm_atomic_state_init(struct drm_device *dev, struct drm_atomic_state *state) 


	state->dev = dev;



	DRM_DEBUG_ATOMIC("Allocated atomic state %p\n", state);

	drm_dbg_atomic(dev, "Allocated atomic state %p\n", state);



	return 0;

fail:
@@ -191,7 +191,7 @@ void drm_atomic_state_default_clear(struct drm_atomic_state *state) 
	struct drm_mode_config *config = &dev->mode_config;

	int i;



	DRM_DEBUG_ATOMIC("Clearing atomic state %p\n", state);

	drm_dbg_atomic(dev, "Clearing atomic state %p\n", state);



	for (i = 0; i < state->num_connector; i++) {

		struct drm_connector *connector = state->connectors[i].ptr;
@@ -301,7 +301,7 @@ void __drm_atomic_state_free(struct kref *ref) 


	drm_atomic_state_clear(state);



	DRM_DEBUG_ATOMIC("Freeing atomic state %p\n", state);

	drm_dbg_atomic(state->dev, "Freeing atomic state %p\n", state);



	if (config->funcs->atomic_state_free) {

		config->funcs->atomic_state_free(state);
@@ -358,7 +358,7 @@ drm_atomic_get_crtc_state(struct drm_atomic_state *state, 
	state->crtcs[index].ptr = crtc;

	crtc_state->state = state;



	DRM_DEBUG_ATOMIC("Added [CRTC:%d:%s] %p state to %p\n",

	drm_dbg_atomic(state->dev, "Added [CRTC:%d:%s] %p state to %p\n",

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



	return crtc_state;
@@ -379,7 +379,8 @@ static int drm_atomic_crtc_check(const struct drm_crtc_state *old_crtc_state, 
	 */



	if (new_crtc_state->active && !new_crtc_state->enable) {

		DRM_DEBUG_ATOMIC("[CRTC:%d:%s] active without enabled\n",

		drm_dbg_atomic(crtc->dev,

			       "[CRTC:%d:%s] active without enabled\n",

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

		return -EINVAL;

	}
@@ -390,14 +391,16 @@ static int drm_atomic_crtc_check(const struct drm_crtc_state *old_crtc_state, 
	 */

	if (drm_core_check_feature(crtc->dev, DRIVER_ATOMIC) &&

	    WARN_ON(new_crtc_state->enable && !new_crtc_state->mode_blob)) {

		DRM_DEBUG_ATOMIC("[CRTC:%d:%s] enabled without mode blob\n",

		drm_dbg_atomic(crtc->dev,

			       "[CRTC:%d:%s] enabled without mode blob\n",

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

		return -EINVAL;

	}



	if (drm_core_check_feature(crtc->dev, DRIVER_ATOMIC) &&

	    WARN_ON(!new_crtc_state->enable && new_crtc_state->mode_blob)) {

		DRM_DEBUG_ATOMIC("[CRTC:%d:%s] disabled with mode blob\n",

		drm_dbg_atomic(crtc->dev,

			       "[CRTC:%d:%s] disabled with mode blob\n",

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

		return -EINVAL;

	}
@@ -414,7 +417,8 @@ static int drm_atomic_crtc_check(const struct drm_crtc_state *old_crtc_state, 
	 */

	if (new_crtc_state->event &&

	    !new_crtc_state->active && !old_crtc_state->active) {

		DRM_DEBUG_ATOMIC("[CRTC:%d:%s] requesting event but off\n",

		drm_dbg_atomic(crtc->dev,

			       "[CRTC:%d:%s] requesting event but off\n",

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

		return -EINVAL;

	}
@@ -460,7 +464,8 @@ static int drm_atomic_connector_check(struct drm_connector *connector, 
		return 0;



	if (writeback_job->fb && !state->crtc) {

		DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] framebuffer without CRTC\n",

		drm_dbg_atomic(connector->dev,

			       "[CONNECTOR:%d:%s] framebuffer without CRTC\n",

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

		return -EINVAL;

	}
@@ -470,7 +475,8 @@ static int drm_atomic_connector_check(struct drm_connector *connector, 
								state->crtc);



	if (writeback_job->fb && !crtc_state->active) {

		DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] has framebuffer, but [CRTC:%d] is off\n",

		drm_dbg_atomic(connector->dev,

			       "[CONNECTOR:%d:%s] has framebuffer, but [CRTC:%d] is off\n",

			       connector->base.id, connector->name,

			       state->crtc->base.id);

		return -EINVAL;
@@ -478,7 +484,8 @@ static int drm_atomic_connector_check(struct drm_connector *connector, 


	if (!writeback_job->fb) {

		if (writeback_job->out_fence) {

			DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] requesting out-fence without framebuffer\n",

			drm_dbg_atomic(connector->dev,

				       "[CONNECTOR:%d:%s] requesting out-fence without framebuffer\n",

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

			return -EINVAL;

		}
@@ -537,7 +544,7 @@ drm_atomic_get_plane_state(struct drm_atomic_state *state, 
	state->planes[index].new_state = plane_state;

	plane_state->state = state;



	DRM_DEBUG_ATOMIC("Added [PLANE:%d:%s] %p state to %p\n",

	drm_dbg_atomic(plane->dev, "Added [PLANE:%d:%s] %p state to %p\n",

		       plane->base.id, plane->name, plane_state, state);



	if (plane_state->crtc) {
@@ -594,11 +601,11 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state, 


	/* either *both* CRTC and FB must be set, or neither */

	if (crtc && !fb) {

		DRM_DEBUG_ATOMIC("[PLANE:%d:%s] CRTC set but no FB\n",

		drm_dbg_atomic(plane->dev, "[PLANE:%d:%s] CRTC set but no FB\n",

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

		return -EINVAL;

	} else if (fb && !crtc) {

		DRM_DEBUG_ATOMIC("[PLANE:%d:%s] FB set but no CRTC\n",

		drm_dbg_atomic(plane->dev, "[PLANE:%d:%s] FB set but no CRTC\n",

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

		return -EINVAL;

	}
@@ -609,7 +616,8 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state, 


	/* Check whether this plane is usable on this CRTC */

	if (!(plane->possible_crtcs & drm_crtc_mask(crtc))) {

		DRM_DEBUG_ATOMIC("Invalid [CRTC:%d:%s] for [PLANE:%d:%s]\n",

		drm_dbg_atomic(plane->dev,

			       "Invalid [CRTC:%d:%s] for [PLANE:%d:%s]\n",

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

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

		return -EINVAL;
@@ -619,7 +627,8 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state, 
	ret = drm_plane_check_pixel_format(plane, fb->format->format,

					   fb->modifier);

	if (ret) {

		DRM_DEBUG_ATOMIC("[PLANE:%d:%s] invalid pixel format %p4cc, modifier 0x%llx\n",

		drm_dbg_atomic(plane->dev,

			       "[PLANE:%d:%s] invalid pixel format %p4cc, modifier 0x%llx\n",

			       plane->base.id, plane->name,

			       &fb->format->format, fb->modifier);

		return ret;
@@ -630,7 +639,8 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state, 
	    new_plane_state->crtc_x > INT_MAX - (int32_t) new_plane_state->crtc_w ||

	    new_plane_state->crtc_h > INT_MAX ||

	    new_plane_state->crtc_y > INT_MAX - (int32_t) new_plane_state->crtc_h) {

		DRM_DEBUG_ATOMIC("[PLANE:%d:%s] invalid CRTC coordinates %ux%u+%d+%d\n",

		drm_dbg_atomic(plane->dev,

			       "[PLANE:%d:%s] invalid CRTC coordinates %ux%u+%d+%d\n",

			       plane->base.id, plane->name,

			       new_plane_state->crtc_w, new_plane_state->crtc_h,

			       new_plane_state->crtc_x, new_plane_state->crtc_y);
@@ -645,7 +655,8 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state, 
	    new_plane_state->src_x > fb_width - new_plane_state->src_w ||

	    new_plane_state->src_h > fb_height ||

	    new_plane_state->src_y > fb_height - new_plane_state->src_h) {

		DRM_DEBUG_ATOMIC("[PLANE:%d:%s] invalid source coordinates "

		drm_dbg_atomic(plane->dev,

			       "[PLANE:%d:%s] invalid source coordinates "

			       "%u.%06ux%u.%06u+%u.%06u+%u.%06u (fb %ux%u)\n",

			       plane->base.id, plane->name,

			       new_plane_state->src_w >> 16,
@@ -671,7 +682,8 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state, 
		    clips->y1 < 0 ||

		    clips->x2 > fb_width ||

		    clips->y2 > fb_height) {

			DRM_DEBUG_ATOMIC("[PLANE:%d:%s] invalid damage clip %d %d %d %d\n",

			drm_dbg_atomic(plane->dev,

				       "[PLANE:%d:%s] invalid damage clip %d %d %d %d\n",

				       plane->base.id, plane->name, clips->x1,

				       clips->y1, clips->x2, clips->y2);

			return -EINVAL;
@@ -681,7 +693,8 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state, 
	}



	if (plane_switching_crtc(old_plane_state, new_plane_state)) {

		DRM_DEBUG_ATOMIC("[PLANE:%d:%s] switching CRTC directly\n",

		drm_dbg_atomic(plane->dev,

			       "[PLANE:%d:%s] switching CRTC directly\n",

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

		return -EINVAL;

	}
@@ -846,7 +859,8 @@ drm_atomic_get_private_obj_state(struct drm_atomic_state *state, 


	state->num_private_objs = num_objs;



	DRM_DEBUG_ATOMIC("Added new private object %p state %p to %p\n",

	drm_dbg_atomic(state->dev,

		       "Added new private object %p state %p to %p\n",

		       obj, obj_state, state);



	return obj_state;
@@ -1027,7 +1041,7 @@ drm_atomic_get_connector_state(struct drm_atomic_state *state, 
	state->connectors[index].ptr = connector;

	connector_state->state = state;



	DRM_DEBUG_ATOMIC("Added [CONNECTOR:%d:%s] %p state to %p\n",

	drm_dbg_atomic(connector->dev, "Added [CONNECTOR:%d:%s] %p state to %p\n",

			 connector->base.id, connector->name,

			 connector_state, state);
@@ -1160,7 +1174,8 @@ drm_atomic_add_encoder_bridges(struct drm_atomic_state *state, 
	if (!encoder)

		return 0;



	DRM_DEBUG_ATOMIC("Adding all bridges for [encoder:%d:%s] to %p\n",

	drm_dbg_atomic(encoder->dev,

		       "Adding all bridges for [encoder:%d:%s] to %p\n",

		       encoder->base.id, encoder->name, state);



	drm_for_each_bridge_in_chain(encoder, bridge) {
@@ -1213,7 +1228,8 @@ drm_atomic_add_affected_connectors(struct drm_atomic_state *state, 
	if (ret)

		return ret;



	DRM_DEBUG_ATOMIC("Adding all current connectors for [CRTC:%d:%s] to %p\n",

	drm_dbg_atomic(crtc->dev,

		       "Adding all current connectors for [CRTC:%d:%s] to %p\n",

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



	/*
@@ -1267,7 +1283,8 @@ drm_atomic_add_affected_planes(struct drm_atomic_state *state, 


	WARN_ON(!drm_atomic_get_new_crtc_state(state, crtc));



	DRM_DEBUG_ATOMIC("Adding all current planes for [CRTC:%d:%s] to %p\n",

	drm_dbg_atomic(crtc->dev,

		       "Adding all current planes for [CRTC:%d:%s] to %p\n",

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



	drm_for_each_plane_mask(plane, state->dev, old_crtc_state->plane_mask) {
@@ -1308,7 +1325,7 @@ int drm_atomic_check_only(struct drm_atomic_state *state) 
	unsigned int affected_crtc = 0;

	int i, ret = 0;



	DRM_DEBUG_ATOMIC("checking %p\n", state);

	drm_dbg_atomic(dev, "checking %p\n", state);



	for_each_new_crtc_in_state(state, crtc, new_crtc_state, i)

		requested_crtc |= drm_crtc_mask(crtc);
@@ -1316,7 +1333,7 @@ int drm_atomic_check_only(struct drm_atomic_state *state) 
	for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) {

		ret = drm_atomic_plane_check(old_plane_state, new_plane_state);

		if (ret) {

			DRM_DEBUG_ATOMIC("[PLANE:%d:%s] atomic core check failed\n",

			drm_dbg_atomic(dev, "[PLANE:%d:%s] atomic core check failed\n",

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

			return ret;

		}
@@ -1325,7 +1342,7 @@ int drm_atomic_check_only(struct drm_atomic_state *state) 
	for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {

		ret = drm_atomic_crtc_check(old_crtc_state, new_crtc_state);

		if (ret) {

			DRM_DEBUG_ATOMIC("[CRTC:%d:%s] atomic core check failed\n",

			drm_dbg_atomic(dev, "[CRTC:%d:%s] atomic core check failed\n",

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

			return ret;

		}
@@ -1334,7 +1351,7 @@ int drm_atomic_check_only(struct drm_atomic_state *state) 
	for_each_new_connector_in_state(state, conn, conn_state, i) {

		ret = drm_atomic_connector_check(conn, conn_state);

		if (ret) {

			DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] atomic core check failed\n",

			drm_dbg_atomic(dev, "[CONNECTOR:%d:%s] atomic core check failed\n",

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

			return ret;

		}
@@ -1344,7 +1361,7 @@ int drm_atomic_check_only(struct drm_atomic_state *state) 
		ret = config->funcs->atomic_check(state->dev, state);



		if (ret) {

			DRM_DEBUG_ATOMIC("atomic driver check for %p failed: %d\n",

			drm_dbg_atomic(dev, "atomic driver check for %p failed: %d\n",

				       state, ret);

			return ret;

		}
@@ -1353,7 +1370,7 @@ int drm_atomic_check_only(struct drm_atomic_state *state) 
	if (!state->allow_modeset) {

		for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {

			if (drm_atomic_crtc_needs_modeset(new_crtc_state)) {

				DRM_DEBUG_ATOMIC("[CRTC:%d:%s] requires full modeset\n",

				drm_dbg_atomic(dev, "[CRTC:%d:%s] requires full modeset\n",

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

				return -EINVAL;

			}
@@ -1374,7 +1391,8 @@ int drm_atomic_check_only(struct drm_atomic_state *state) 
	 * so compositors know what's going on.

	 */

	if (affected_crtc != requested_crtc) {

		DRM_DEBUG_ATOMIC("driver added CRTC to commit: requested 0x%x, affected 0x%0x\n",

		drm_dbg_atomic(dev,

			       "driver added CRTC to commit: requested 0x%x, affected 0x%0x\n",

			       requested_crtc, affected_crtc);

		WARN(!state->allow_modeset, "adding CRTC not allowed without modesets: requested 0x%x, affected 0x%0x\n",

		     requested_crtc, affected_crtc);
@@ -1407,7 +1425,7 @@ int drm_atomic_commit(struct drm_atomic_state *state) 
	if (ret)

		return ret;



	DRM_DEBUG_ATOMIC("committing %p\n", state);

	drm_dbg_atomic(state->dev, "committing %p\n", state);



	return config->funcs->atomic_commit(state->dev, state, false);

}
@@ -1436,7 +1454,7 @@ int drm_atomic_nonblocking_commit(struct drm_atomic_state *state) 
	if (ret)

		return ret;



	DRM_DEBUG_ATOMIC("committing %p nonblocking\n", state);

	drm_dbg_atomic(state->dev, "committing %p nonblocking\n", state);



	return config->funcs->atomic_commit(state->dev, state, true);

}
@@ -1633,11 +1651,11 @@ void drm_atomic_print_new_state(const struct drm_atomic_state *state, 
	int i;



	if (!p) {

		DRM_ERROR("invalid drm printer\n");

		drm_err(state->dev, "invalid drm printer\n");

		return;

	}



	DRM_DEBUG_ATOMIC("checking %p\n", state);

	drm_dbg_atomic(state->dev, "checking %p\n", state);



	for_each_new_plane_in_state(state, plane, plane_state, i)

		drm_atomic_plane_print_state(p, plane_state);

drivers/gpu/drm/drm_atomic_helper.c

+134 −109
Original line number Diff line number Diff line
@@ -132,7 +132,8 @@ static int handle_conflicting_encoders(struct drm_atomic_state *state, 


		if (new_encoder) {

			if (encoder_mask & drm_encoder_mask(new_encoder)) {

				DRM_DEBUG_ATOMIC("[ENCODER:%d:%s] on [CONNECTOR:%d:%s] already assigned\n",

				drm_dbg_atomic(connector->dev,

					       "[ENCODER:%d:%s] on [CONNECTOR:%d:%s] already assigned\n",

					       new_encoder->base.id, new_encoder->name,

					       connector->base.id, connector->name);
@@ -169,7 +170,8 @@ static int handle_conflicting_encoders(struct drm_atomic_state *state, 
			continue;



		if (!disable_conflicting_encoders) {

			DRM_DEBUG_ATOMIC("[ENCODER:%d:%s] in use on [CRTC:%d:%s] by [CONNECTOR:%d:%s]\n",

			drm_dbg_atomic(connector->dev,

				       "[ENCODER:%d:%s] in use on [CRTC:%d:%s] by [CONNECTOR:%d:%s]\n",

				       encoder->base.id, encoder->name,

				       connector->state->crtc->base.id,

				       connector->state->crtc->name,
@@ -184,7 +186,8 @@ static int handle_conflicting_encoders(struct drm_atomic_state *state, 
			goto out;

		}



		DRM_DEBUG_ATOMIC("[ENCODER:%d:%s] in use on [CRTC:%d:%s], disabling [CONNECTOR:%d:%s]\n",

		drm_dbg_atomic(connector->dev,

			       "[ENCODER:%d:%s] in use on [CRTC:%d:%s], disabling [CONNECTOR:%d:%s]\n",

			       encoder->base.id, encoder->name,

			       new_conn_state->crtc->base.id, new_conn_state->crtc->name,

			       connector->base.id, connector->name);
@@ -268,7 +271,8 @@ steal_encoder(struct drm_atomic_state *state, 


		encoder_crtc = old_connector_state->crtc;



		DRM_DEBUG_ATOMIC("[ENCODER:%d:%s] in use on [CRTC:%d:%s], stealing it\n",

		drm_dbg_atomic(encoder->dev,

			       "[ENCODER:%d:%s] in use on [CRTC:%d:%s], stealing it\n",

			       encoder->base.id, encoder->name,

			       encoder_crtc->base.id, encoder_crtc->name);
@@ -291,9 +295,8 @@ update_connector_routing(struct drm_atomic_state *state, 
	struct drm_encoder *new_encoder;

	struct drm_crtc_state *crtc_state;



	DRM_DEBUG_ATOMIC("Updating routing for [CONNECTOR:%d:%s]\n",

			 connector->base.id,

			 connector->name);

	drm_dbg_atomic(connector->dev, "Updating routing for [CONNECTOR:%d:%s]\n",

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



	if (old_connector_state->crtc != new_connector_state->crtc) {

		if (old_connector_state->crtc) {
@@ -308,9 +311,8 @@ update_connector_routing(struct drm_atomic_state *state, 
	}



	if (!new_connector_state->crtc) {

		DRM_DEBUG_ATOMIC("Disabling [CONNECTOR:%d:%s]\n",

				connector->base.id,

				connector->name);

		drm_dbg_atomic(connector->dev, "Disabling [CONNECTOR:%d:%s]\n",

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



		set_best_encoder(state, new_connector_state, NULL);
@@ -339,7 +341,8 @@ update_connector_routing(struct drm_atomic_state *state, 
	 */

	if (!state->duplicated && drm_connector_is_unregistered(connector) &&

	    crtc_state->active) {

		DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] is not registered\n",

		drm_dbg_atomic(connector->dev,

			       "[CONNECTOR:%d:%s] is not registered\n",

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

		return -EINVAL;

	}
@@ -354,14 +357,15 @@ update_connector_routing(struct drm_atomic_state *state, 
		new_encoder = drm_connector_get_single_encoder(connector);



	if (!new_encoder) {

		DRM_DEBUG_ATOMIC("No suitable encoder found for [CONNECTOR:%d:%s]\n",

				 connector->base.id,

				 connector->name);

		drm_dbg_atomic(connector->dev,

			       "No suitable encoder found for [CONNECTOR:%d:%s]\n",

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

		return -EINVAL;

	}



	if (!drm_encoder_crtc_ok(new_encoder, new_connector_state->crtc)) {

		DRM_DEBUG_ATOMIC("[ENCODER:%d:%s] incompatible with [CRTC:%d:%s]\n",

		drm_dbg_atomic(connector->dev,

			       "[ENCODER:%d:%s] incompatible with [CRTC:%d:%s]\n",

			       new_encoder->base.id,

			       new_encoder->name,

			       new_connector_state->crtc->base.id,
@@ -372,7 +376,8 @@ update_connector_routing(struct drm_atomic_state *state, 
	if (new_encoder == new_connector_state->best_encoder) {

		set_best_encoder(state, new_connector_state, new_encoder);



		DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] keeps [ENCODER:%d:%s], now on [CRTC:%d:%s]\n",

		drm_dbg_atomic(connector->dev,

			       "[CONNECTOR:%d:%s] keeps [ENCODER:%d:%s], now on [CRTC:%d:%s]\n",

			       connector->base.id,

			       connector->name,

			       new_encoder->base.id,
@@ -389,7 +394,8 @@ update_connector_routing(struct drm_atomic_state *state, 


	crtc_state->connectors_changed = true;



	DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] using [ENCODER:%d:%s] on [CRTC:%d:%s]\n",

	drm_dbg_atomic(connector->dev,

		       "[CONNECTOR:%d:%s] using [ENCODER:%d:%s] on [CRTC:%d:%s]\n",

		       connector->base.id,

		       connector->name,

		       new_encoder->base.id,
@@ -443,7 +449,7 @@ mode_fixup(struct drm_atomic_state *state) 
						    new_crtc_state,

						    new_conn_state);

		if (ret) {

			DRM_DEBUG_ATOMIC("Bridge atomic check failed\n");

			drm_dbg_atomic(encoder->dev, "Bridge atomic check failed\n");

			return ret;

		}
@@ -451,7 +457,8 @@ mode_fixup(struct drm_atomic_state *state) 
			ret = funcs->atomic_check(encoder, new_crtc_state,

						  new_conn_state);

			if (ret) {

				DRM_DEBUG_ATOMIC("[ENCODER:%d:%s] check failed\n",

				drm_dbg_atomic(encoder->dev,

					       "[ENCODER:%d:%s] check failed\n",

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

				return ret;

			}
@@ -459,7 +466,8 @@ mode_fixup(struct drm_atomic_state *state) 
			ret = funcs->mode_fixup(encoder, &new_crtc_state->mode,

						&new_crtc_state->adjusted_mode);

			if (!ret) {

				DRM_DEBUG_ATOMIC("[ENCODER:%d:%s] fixup failed\n",

				drm_dbg_atomic(encoder->dev,

					       "[ENCODER:%d:%s] fixup failed\n",

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

				return -EINVAL;

			}
@@ -483,7 +491,7 @@ mode_fixup(struct drm_atomic_state *state) 
		ret = funcs->mode_fixup(crtc, &new_crtc_state->mode,

					&new_crtc_state->adjusted_mode);

		if (!ret) {

			DRM_DEBUG_ATOMIC("[CRTC:%d:%s] fixup failed\n",

			drm_dbg_atomic(crtc->dev, "[CRTC:%d:%s] fixup failed\n",

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

			return -EINVAL;

		}
@@ -502,7 +510,8 @@ static enum drm_mode_status mode_valid_path(struct drm_connector *connector, 


	ret = drm_encoder_mode_valid(encoder, mode);

	if (ret != MODE_OK) {

		DRM_DEBUG_ATOMIC("[ENCODER:%d:%s] mode_valid() failed\n",

		drm_dbg_atomic(encoder->dev,

			       "[ENCODER:%d:%s] mode_valid() failed\n",

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

		return ret;

	}
@@ -511,13 +520,13 @@ static enum drm_mode_status mode_valid_path(struct drm_connector *connector, 
	ret = drm_bridge_chain_mode_valid(bridge, &connector->display_info,

					  mode);

	if (ret != MODE_OK) {

		DRM_DEBUG_ATOMIC("[BRIDGE] mode_valid() failed\n");

		drm_dbg_atomic(encoder->dev, "[BRIDGE] mode_valid() failed\n");

		return ret;

	}



	ret = drm_crtc_mode_valid(crtc, mode);

	if (ret != MODE_OK) {

		DRM_DEBUG_ATOMIC("[CRTC:%d:%s] mode_valid() failed\n",

		drm_dbg_atomic(encoder->dev, "[CRTC:%d:%s] mode_valid() failed\n",

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

		return ret;

	}
@@ -619,13 +628,13 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, 
		WARN_ON(!drm_modeset_is_locked(&crtc->mutex));



		if (!drm_mode_equal(&old_crtc_state->mode, &new_crtc_state->mode)) {

			DRM_DEBUG_ATOMIC("[CRTC:%d:%s] mode changed\n",

			drm_dbg_atomic(dev, "[CRTC:%d:%s] mode changed\n",

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

			new_crtc_state->mode_changed = true;

		}



		if (old_crtc_state->enable != new_crtc_state->enable) {

			DRM_DEBUG_ATOMIC("[CRTC:%d:%s] enable changed\n",

			drm_dbg_atomic(dev, "[CRTC:%d:%s] enable changed\n",

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



			/*
@@ -641,13 +650,13 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, 
		}



		if (old_crtc_state->active != new_crtc_state->active) {

			DRM_DEBUG_ATOMIC("[CRTC:%d:%s] active changed\n",

			drm_dbg_atomic(dev, "[CRTC:%d:%s] active changed\n",

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

			new_crtc_state->active_changed = true;

		}



		if (new_crtc_state->enable != has_connectors) {

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

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

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



			return -EINVAL;
@@ -708,7 +717,8 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, 
		if (!drm_atomic_crtc_needs_modeset(new_crtc_state))

			continue;



		DRM_DEBUG_ATOMIC("[CRTC:%d:%s] needs all connectors, enable: %c, active: %c\n",

		drm_dbg_atomic(dev,

			       "[CRTC:%d:%s] needs all connectors, enable: %c, active: %c\n",

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

			       new_crtc_state->enable ? 'y' : 'n',

			       new_crtc_state->active ? 'y' : 'n');
@@ -818,7 +828,8 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state, 
	}



	if (!crtc_state->enable && !can_update_disabled) {

		DRM_DEBUG_KMS("Cannot update plane of a disabled CRTC.\n");

		drm_dbg_kms(plane_state->crtc->dev,

			       "Cannot update plane of a disabled CRTC.\n");

		return -EINVAL;

	}
@@ -828,7 +839,8 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state, 
	hscale = drm_rect_calc_hscale(src, dst, min_scale, max_scale);

	vscale = drm_rect_calc_vscale(src, dst, min_scale, max_scale);

	if (hscale < 0 || vscale < 0) {

		DRM_DEBUG_KMS("Invalid scaling of plane\n");

		drm_dbg_kms(plane_state->crtc->dev,

			       "Invalid scaling of plane\n");

		drm_rect_debug_print("src: ", &plane_state->src, true);

		drm_rect_debug_print("dst: ", &plane_state->dst, false);

		return -ERANGE;
@@ -852,7 +864,8 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state, 
		return 0;



	if (!can_position && !drm_rect_equals(dst, &clip)) {

		DRM_DEBUG_KMS("Plane must cover entire CRTC\n");

		drm_dbg_kms(plane_state->crtc->dev,

			       "Plane must cover entire CRTC\n");

		drm_rect_debug_print("dst: ", dst, false);

		drm_rect_debug_print("clip: ", &clip, false);

		return -EINVAL;
@@ -904,7 +917,8 @@ drm_atomic_helper_check_planes(struct drm_device *dev, 


		ret = funcs->atomic_check(plane, state);

		if (ret) {

			DRM_DEBUG_ATOMIC("[PLANE:%d:%s] atomic driver check failed\n",

			drm_dbg_atomic(plane->dev,

				       "[PLANE:%d:%s] atomic driver check failed\n",

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

			return ret;

		}
@@ -920,7 +934,8 @@ drm_atomic_helper_check_planes(struct drm_device *dev, 


		ret = funcs->atomic_check(crtc, state);

		if (ret) {

			DRM_DEBUG_ATOMIC("[CRTC:%d:%s] atomic driver check failed\n",

			drm_dbg_atomic(crtc->dev,

				       "[CRTC:%d:%s] atomic driver check failed\n",

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

			return ret;

		}
@@ -1049,7 +1064,7 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) 


		funcs = encoder->helper_private;



		DRM_DEBUG_ATOMIC("disabling [ENCODER:%d:%s]\n",

		drm_dbg_atomic(dev, "disabling [ENCODER:%d:%s]\n",

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



		/*
@@ -1087,7 +1102,7 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) 


		funcs = crtc->helper_private;



		DRM_DEBUG_ATOMIC("disabling [CRTC:%d:%s]\n",

		drm_dbg_atomic(dev, "disabling [CRTC:%d:%s]\n",

			       crtc->base.id, crtc->name);
@@ -1229,7 +1244,7 @@ crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *old_state) 
		funcs = crtc->helper_private;



		if (new_crtc_state->enable && funcs->mode_set_nofb) {

			DRM_DEBUG_ATOMIC("modeset on [CRTC:%d:%s]\n",

			drm_dbg_atomic(dev, "modeset on [CRTC:%d:%s]\n",

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



			funcs->mode_set_nofb(crtc);
@@ -1254,7 +1269,7 @@ crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *old_state) 
		if (!new_crtc_state->mode_changed)

			continue;



		DRM_DEBUG_ATOMIC("modeset on [ENCODER:%d:%s]\n",

		drm_dbg_atomic(dev, "modeset on [ENCODER:%d:%s]\n",

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



		/*
@@ -1357,7 +1372,7 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, 
		funcs = crtc->helper_private;



		if (new_crtc_state->enable) {

			DRM_DEBUG_ATOMIC("enabling [CRTC:%d:%s]\n",

			drm_dbg_atomic(dev, "enabling [CRTC:%d:%s]\n",

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

			if (funcs->atomic_enable)

				funcs->atomic_enable(crtc, old_state);
@@ -1381,7 +1396,7 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, 
		encoder = new_conn_state->best_encoder;

		funcs = encoder->helper_private;



		DRM_DEBUG_ATOMIC("enabling [ENCODER:%d:%s]\n",

		drm_dbg_atomic(dev, "enabling [ENCODER:%d:%s]\n",

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



		/*
@@ -1551,7 +1566,7 @@ void drm_atomic_helper_wait_for_flip_done(struct drm_device *dev, 


		ret = wait_for_completion_timeout(&commit->flip_done, 10 * HZ);

		if (ret == 0)

			DRM_ERROR("[CRTC:%d:%s] flip_done timed out\n",

			drm_err(dev, "[CRTC:%d:%s] flip_done timed out\n",

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

	}
@@ -1739,7 +1754,8 @@ int drm_atomic_helper_async_check(struct drm_device *dev, 
	 */

	if (old_plane_state->commit &&

	    !try_wait_for_completion(&old_plane_state->commit->hw_done)) {

		DRM_DEBUG_ATOMIC("[PLANE:%d:%s] inflight previous commit preventing async commit\n",

		drm_dbg_atomic(dev,

			       "[PLANE:%d:%s] inflight previous commit preventing async commit\n",

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

		return -EBUSY;

	}
@@ -1962,7 +1978,8 @@ static int stall_checks(struct drm_crtc *crtc, bool nonblock) 
			 */

			if (!completed && nonblock) {

				spin_unlock(&crtc->commit_lock);

				DRM_DEBUG_ATOMIC("[CRTC:%d:%s] busy with a previous commit\n",

				drm_dbg_atomic(crtc->dev,

					       "[CRTC:%d:%s] busy with a previous commit\n",

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



				return -EBUSY;
@@ -1985,7 +2002,7 @@ static int stall_checks(struct drm_crtc *crtc, bool nonblock) 
	ret = wait_for_completion_interruptible_timeout(&stall_commit->cleanup_done,

							10*HZ);

	if (ret == 0)

		DRM_ERROR("[CRTC:%d:%s] cleanup_done timed out\n",

		drm_err(crtc->dev, "[CRTC:%d:%s] cleanup_done timed out\n",

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



	drm_crtc_commit_put(stall_commit);
@@ -2150,7 +2167,8 @@ int drm_atomic_helper_setup_commit(struct drm_atomic_state *state, 
		 */

		if (nonblock && old_conn_state->commit &&

		    !try_wait_for_completion(&old_conn_state->commit->flip_done)) {

			DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] busy with a previous commit\n",

			drm_dbg_atomic(conn->dev,

				       "[CONNECTOR:%d:%s] busy with a previous commit\n",

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



			return -EBUSY;
@@ -2171,7 +2189,8 @@ int drm_atomic_helper_setup_commit(struct drm_atomic_state *state, 
		 */

		if (nonblock && old_plane_state->commit &&

		    !try_wait_for_completion(&old_plane_state->commit->flip_done)) {

			DRM_DEBUG_ATOMIC("[PLANE:%d:%s] busy with a previous commit\n",

			drm_dbg_atomic(plane->dev,

				       "[PLANE:%d:%s] busy with a previous commit\n",

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



			return -EBUSY;
@@ -2218,21 +2237,24 @@ void drm_atomic_helper_wait_for_dependencies(struct drm_atomic_state *old_state) 
	for_each_old_crtc_in_state(old_state, crtc, old_crtc_state, i) {

		ret = drm_crtc_commit_wait(old_crtc_state->commit);

		if (ret)

			DRM_ERROR("[CRTC:%d:%s] commit wait timed out\n",

			drm_err(crtc->dev,

				"[CRTC:%d:%s] commit wait timed out\n",

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

	}



	for_each_old_connector_in_state(old_state, conn, old_conn_state, i) {

		ret = drm_crtc_commit_wait(old_conn_state->commit);

		if (ret)

			DRM_ERROR("[CONNECTOR:%d:%s] commit wait timed out\n",

			drm_err(conn->dev,

				"[CONNECTOR:%d:%s] commit wait timed out\n",

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

	}



	for_each_old_plane_in_state(old_state, plane, old_plane_state, i) {

		ret = drm_crtc_commit_wait(old_plane_state->commit);

		if (ret)

			DRM_ERROR("[PLANE:%d:%s] commit wait timed out\n",

			drm_err(plane->dev,

				"[PLANE:%d:%s] commit wait timed out\n",

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

	}

}
@@ -3120,7 +3142,9 @@ void drm_atomic_helper_shutdown(struct drm_device *dev) 


	ret = drm_atomic_helper_disable_all(dev, &ctx);

	if (ret)

		DRM_ERROR("Disabling all crtc's during unload failed with %i\n", ret);

		drm_err(dev,

			"Disabling all crtc's during unload failed with %i\n",

			ret);



	DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);

}
@@ -3380,7 +3404,8 @@ static int page_flip_common(struct drm_atomic_state *state, 
	/* Make sure we don't accidentally do a full modeset. */

	state->allow_modeset = false;

	if (!crtc_state->active) {

		DRM_DEBUG_ATOMIC("[CRTC:%d:%s] disabled, rejecting legacy flip\n",

		drm_dbg_atomic(crtc->dev,

			       "[CRTC:%d:%s] disabled, rejecting legacy flip\n",

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

		return -EINVAL;

	}

drivers/gpu/drm/drm_atomic_uapi.c

+1 −1
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector, 
		state->scaling_mode = val;

	} else if (property == config->content_protection_property) {

		if (val == DRM_MODE_CONTENT_PROTECTION_ENABLED) {

			DRM_DEBUG_KMS("only drivers can set CP Enabled\n");

			drm_dbg_kms(dev, "only drivers can set CP Enabled\n");

			return -EINVAL;

		}

		state->content_protection = val;

drivers/gpu/drm/drm_auth.c

+8 −4

File changed.

Preview size limit exceeded, changes collapsed.