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

Commit 17a38d9c authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Add DRM_DEBUG_ATOMIC 



Atomic state handling adds a lot of indirection and complexity between
simple updates and drivers. For easier debugging the diagnostic output
is therefore rather chatty. Which is great for tracking down atomic
issues, but really annoying otherwise.

Add a new DRM_DEBUG_ATOMIC to be able to filter this out.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent 7f50002f

drivers/gpu/drm/drm_atomic.c

+51 −49
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ drm_atomic_state_alloc(struct drm_device *dev) 


	state->dev = dev;



	DRM_DEBUG_KMS("Allocate atomic state %p\n", state);

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



	return state;

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

	int i;



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

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



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

		struct drm_connector *connector = state->connectors[i];
@@ -172,7 +172,7 @@ void drm_atomic_state_free(struct drm_atomic_state *state) 
{

	drm_atomic_state_clear(state);



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

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



	kfree_state(state);

}
@@ -217,7 +217,7 @@ drm_atomic_get_crtc_state(struct drm_atomic_state *state, 
	state->crtcs[index] = crtc;

	crtc_state->state = state;



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

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

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



	return crtc_state;
@@ -293,7 +293,7 @@ static int drm_atomic_crtc_check(struct drm_crtc *crtc, 
	 */



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

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

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

				 crtc->base.id);

		return -EINVAL;

	}
@@ -340,7 +340,7 @@ drm_atomic_get_plane_state(struct drm_atomic_state *state, 
	state->planes[index] = plane;

	plane_state->state = state;



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

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

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



	if (plane_state->crtc) {
@@ -477,10 +477,10 @@ static int drm_atomic_plane_check(struct drm_plane *plane, 


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

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

		DRM_DEBUG_KMS("CRTC set but no FB\n");

		DRM_DEBUG_ATOMIC("CRTC set but no FB\n");

		return -EINVAL;

	} else if (WARN_ON(state->fb && !state->crtc)) {

		DRM_DEBUG_KMS("FB set but no CRTC\n");

		DRM_DEBUG_ATOMIC("FB set but no CRTC\n");

		return -EINVAL;

	}
@@ -490,7 +490,7 @@ static int drm_atomic_plane_check(struct drm_plane *plane, 


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

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

		DRM_DEBUG_KMS("Invalid crtc for plane\n");

		DRM_DEBUG_ATOMIC("Invalid crtc for plane\n");

		return -EINVAL;

	}
@@ -499,7 +499,7 @@ static int drm_atomic_plane_check(struct drm_plane *plane, 
		if (state->fb->pixel_format == plane->format_types[i])

			break;

	if (i == plane->format_count) {

		DRM_DEBUG_KMS("Invalid pixel format %s\n",

		DRM_DEBUG_ATOMIC("Invalid pixel format %s\n",

				 drm_get_format_name(state->fb->pixel_format));

		return -EINVAL;

	}
@@ -509,7 +509,7 @@ static int drm_atomic_plane_check(struct drm_plane *plane, 
	    state->crtc_x > INT_MAX - (int32_t) state->crtc_w ||

	    state->crtc_h > INT_MAX ||

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

		DRM_DEBUG_KMS("Invalid CRTC coordinates %ux%u+%d+%d\n",

		DRM_DEBUG_ATOMIC("Invalid CRTC coordinates %ux%u+%d+%d\n",

				 state->crtc_w, state->crtc_h,

				 state->crtc_x, state->crtc_y);

		return -ERANGE;
@@ -523,7 +523,7 @@ static int drm_atomic_plane_check(struct drm_plane *plane, 
	    state->src_x > fb_width - state->src_w ||

	    state->src_h > fb_height ||

	    state->src_y > fb_height - state->src_h) {

		DRM_DEBUG_KMS("Invalid source coordinates "

		DRM_DEBUG_ATOMIC("Invalid source coordinates "

				 "%u.%06ux%u.%06u+%u.%06u+%u.%06u\n",

				 state->src_w >> 16, ((state->src_w & 0xffff) * 15625) >> 10,

				 state->src_h >> 16, ((state->src_h & 0xffff) * 15625) >> 10,
@@ -575,7 +575,7 @@ drm_atomic_get_connector_state(struct drm_atomic_state *state, 
	 * at most the array is a bit too large.

	 */

	if (index >= state->num_connector) {

		DRM_DEBUG_KMS("Hot-added connector would overflow state array, restarting\n");

		DRM_DEBUG_ATOMIC("Hot-added connector would overflow state array, restarting\n");

		return ERR_PTR(-EAGAIN);

	}
@@ -590,7 +590,7 @@ drm_atomic_get_connector_state(struct drm_atomic_state *state, 
	state->connectors[index] = connector;

	connector_state->state = state;



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

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

			 connector->base.id, connector_state, state);



	if (connector_state->crtc) {
@@ -752,10 +752,11 @@ drm_atomic_set_crtc_for_plane(struct drm_plane_state *plane_state, 
	}



	if (crtc)

		DRM_DEBUG_KMS("Link plane state %p to [CRTC:%d]\n",

		DRM_DEBUG_ATOMIC("Link plane state %p to [CRTC:%d]\n",

				 plane_state, crtc->base.id);

	else

		DRM_DEBUG_KMS("Link plane state %p to [NOCRTC]\n", plane_state);

		DRM_DEBUG_ATOMIC("Link plane state %p to [NOCRTC]\n",

				 plane_state);



	return 0;

}
@@ -782,10 +783,11 @@ drm_atomic_set_fb_for_plane(struct drm_plane_state *plane_state, 
	plane_state->fb = fb;



	if (fb)

		DRM_DEBUG_KMS("Set [FB:%d] for plane state %p\n",

		DRM_DEBUG_ATOMIC("Set [FB:%d] for plane state %p\n",

				 fb->base.id, plane_state);

	else

		DRM_DEBUG_KMS("Set [NOFB] for plane state %p\n", plane_state);

		DRM_DEBUG_ATOMIC("Set [NOFB] for plane state %p\n",

				 plane_state);

}

EXPORT_SYMBOL(drm_atomic_set_fb_for_plane);
@@ -818,10 +820,10 @@ drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_state, 
	conn_state->crtc = crtc;



	if (crtc)

		DRM_DEBUG_KMS("Link connector state %p to [CRTC:%d]\n",

		DRM_DEBUG_ATOMIC("Link connector state %p to [CRTC:%d]\n",

				 conn_state, crtc->base.id);

	else

		DRM_DEBUG_KMS("Link connector state %p to [NOCRTC]\n",

		DRM_DEBUG_ATOMIC("Link connector state %p to [NOCRTC]\n",

				 conn_state);



	return 0;
@@ -858,7 +860,7 @@ drm_atomic_add_affected_connectors(struct drm_atomic_state *state, 
	if (ret)

		return ret;



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

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

			 crtc->base.id, state);



	/*
@@ -901,7 +903,7 @@ drm_atomic_connectors_for_crtc(struct drm_atomic_state *state, 
			num_connected_connectors++;

	}



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

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

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



	return num_connected_connectors;
@@ -953,7 +955,7 @@ int drm_atomic_check_only(struct drm_atomic_state *state) 
	int ncrtcs = config->num_crtc;

	int i, ret = 0;



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

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



	for (i = 0; i < nplanes; i++) {

		struct drm_plane *plane = state->planes[i];
@@ -963,7 +965,7 @@ int drm_atomic_check_only(struct drm_atomic_state *state) 


		ret = drm_atomic_plane_check(plane, state->plane_states[i]);

		if (ret) {

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

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

					 plane->base.id);

			return ret;

		}
@@ -977,7 +979,7 @@ int drm_atomic_check_only(struct drm_atomic_state *state) 


		ret = drm_atomic_crtc_check(crtc, state->crtc_states[i]);

		if (ret) {

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

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

					 crtc->base.id);

			return ret;

		}
@@ -996,7 +998,7 @@ int drm_atomic_check_only(struct drm_atomic_state *state) 


			if (crtc_state->mode_changed ||

			    crtc_state->active_changed) {

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

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

						 crtc->base.id);

				return -EINVAL;

			}
@@ -1032,7 +1034,7 @@ int drm_atomic_commit(struct drm_atomic_state *state) 
	if (ret)

		return ret;



	DRM_DEBUG_KMS("commiting %p\n", state);

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



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

}
@@ -1063,7 +1065,7 @@ int drm_atomic_async_commit(struct drm_atomic_state *state) 
	if (ret)

		return ret;



	DRM_DEBUG_KMS("commiting %p asynchronously\n", state);

	DRM_DEBUG_ATOMIC("commiting %p asynchronously\n", state);



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

}

drivers/gpu/drm/drm_atomic_helper.c

+62 −62
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ steal_encoder(struct drm_atomic_state *state, 
	 */

	WARN_ON(!drm_modeset_is_locked(&config->connection_mutex));



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

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

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

			 encoder_crtc->base.id);
@@ -130,7 +130,7 @@ steal_encoder(struct drm_atomic_state *state, 
		if (connector->state->best_encoder != encoder)

			continue;



		DRM_DEBUG_KMS("Stealing encoder from [CONNECTOR:%d:%s]\n",

		DRM_DEBUG_ATOMIC("Stealing encoder from [CONNECTOR:%d:%s]\n",

				 connector->base.id,

				 connector->name);
@@ -165,7 +165,7 @@ update_connector_routing(struct drm_atomic_state *state, int conn_idx) 
	if (!connector)

		return 0;



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

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

			 connector->base.id,

			 connector->name);
@@ -186,7 +186,7 @@ update_connector_routing(struct drm_atomic_state *state, int conn_idx) 
	}



	if (!connector_state->crtc) {

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

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

				connector->base.id,

				connector->name);
@@ -199,14 +199,14 @@ update_connector_routing(struct drm_atomic_state *state, int conn_idx) 
	new_encoder = funcs->best_encoder(connector);



	if (!new_encoder) {

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

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

				 connector->base.id,

				 connector->name);

		return -EINVAL;

	}



	if (new_encoder == connector_state->best_encoder) {

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

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

				 connector->base.id,

				 connector->name,

				 new_encoder->base.id,
@@ -222,7 +222,7 @@ update_connector_routing(struct drm_atomic_state *state, int conn_idx) 
	if (encoder_crtc) {

		ret = steal_encoder(state, new_encoder, encoder_crtc);

		if (ret) {

			DRM_DEBUG_KMS("Encoder stealing failed for [CONNECTOR:%d:%s]\n",

			DRM_DEBUG_ATOMIC("Encoder stealing failed for [CONNECTOR:%d:%s]\n",

					 connector->base.id,

					 connector->name);

			return ret;
@@ -235,7 +235,7 @@ update_connector_routing(struct drm_atomic_state *state, int conn_idx) 
	crtc_state = state->crtc_states[idx];

	crtc_state->mode_changed = true;



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

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

			 connector->base.id,

			 connector->name,

			 new_encoder->base.id,
@@ -292,7 +292,7 @@ mode_fixup(struct drm_atomic_state *state) 
					encoder->bridge, &crtc_state->mode,

					&crtc_state->adjusted_mode);

			if (!ret) {

				DRM_DEBUG_KMS("Bridge fixup failed\n");

				DRM_DEBUG_ATOMIC("Bridge fixup failed\n");

				return -EINVAL;

			}

		}
@@ -301,7 +301,7 @@ mode_fixup(struct drm_atomic_state *state) 
			ret = funcs->atomic_check(encoder, crtc_state,

						  conn_state);

			if (ret) {

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

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

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

				return ret;

			}
@@ -309,7 +309,7 @@ mode_fixup(struct drm_atomic_state *state) 
			ret = funcs->mode_fixup(encoder, &crtc_state->mode,

						&crtc_state->adjusted_mode);

			if (!ret) {

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

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

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

				return -EINVAL;

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

					&crtc_state->adjusted_mode);

		if (!ret) {

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

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

					 crtc->base.id);

			return -EINVAL;

		}
@@ -384,13 +384,13 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, 
			continue;



		if (!drm_mode_equal(&crtc->state->mode, &crtc_state->mode)) {

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

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

					 crtc->base.id);

			crtc_state->mode_changed = true;

		}



		if (crtc->state->enable != crtc_state->enable) {

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

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

					 crtc->base.id);

			crtc_state->mode_changed = true;

		}
@@ -428,7 +428,7 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, 
		 * a full modeset because update_connector_routing force that.

		 */

		if (crtc->state->active != crtc_state->active) {

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

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

					 crtc->base.id);

			crtc_state->active_changed = true;

		}
@@ -436,7 +436,7 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, 
		if (!needs_modeset(crtc_state))

			continue;



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

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

				 crtc->base.id,

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

			      crtc_state->active ? 'y' : 'n');
@@ -449,7 +449,7 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, 
								crtc);



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

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

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

					 crtc->base.id);



			return -EINVAL;
@@ -497,7 +497,7 @@ drm_atomic_helper_check_planes(struct drm_device *dev, 


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

		if (ret) {

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

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

					 plane->base.id);

			return ret;

		}
@@ -517,7 +517,7 @@ drm_atomic_helper_check_planes(struct drm_device *dev, 


		ret = funcs->atomic_check(crtc, state->crtc_states[i]);

		if (ret) {

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

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

					 crtc->base.id);

			return ret;

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


		funcs = encoder->helper_private;



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

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

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



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


		funcs = crtc->helper_private;



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

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

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



		if (crtc->state->enable) {

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

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

					 crtc->base.id);



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

			continue;



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

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

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



		/*
@@ -816,7 +816,7 @@ void drm_atomic_helper_commit_post_planes(struct drm_device *dev, 
		funcs = crtc->helper_private;



		if (crtc->state->enable) {

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

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

					 crtc->base.id);



			if (funcs->enable)
@@ -842,7 +842,7 @@ void drm_atomic_helper_commit_post_planes(struct drm_device *dev, 
		encoder = connector->state->best_encoder;

		funcs = encoder->helper_private;



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

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

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



		/*

include/drm/drmP.h

+9 −0
Original line number Diff line number Diff line
@@ -104,6 +104,9 @@ struct dma_buf_attachment; 
 * PRIME: used in the prime code.

 *	  This is the category used by the DRM_DEBUG_PRIME() macro.

 *

 * ATOMIC: used in the atomic code.

 *	  This is the category used by the DRM_DEBUG_ATOMIC() macro.

 *

 * Enabling verbose debug messages is done through the drm.debug parameter,

 * each category being enabled by a bit.

 *
@@ -121,6 +124,7 @@ struct dma_buf_attachment; 
#define DRM_UT_DRIVER		0x02

#define DRM_UT_KMS		0x04

#define DRM_UT_PRIME		0x08

#define DRM_UT_ATOMIC		0x10



extern __printf(2, 3)

void drm_ut_debug_printk(const char *function_name,
@@ -207,6 +211,11 @@ void drm_err(const char *format, ...); 
		if (unlikely(drm_debug & DRM_UT_PRIME))			\

			drm_ut_debug_printk(__func__, fmt, ##args);	\

	} while (0)

#define DRM_DEBUG_ATOMIC(fmt, args...)					\

	do {								\

		if (unlikely(drm_debug & DRM_UT_ATOMIC))		\

			drm_ut_debug_printk(__func__, fmt, ##args);	\

	} while (0)



/*@}*/