Unverified Commit 018ad18f authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/atomic: Print the state every non-blocking commit 



The DRM_UT_STATE controls whether we're calling
drm_atomic_print_new_state() whenever a new state is committed. However,
that call is made in the drm_mode_atomic_ioctl(), whereas we have
multiple users of the drm_atomic_commit() function in the kernel
(framebuffer emulation, drm_atomic_helper_dirtyfb, etc.).

This leads to multiple states being committed but never actually
displayed even though we asked to have verbose atomic state debugging.

Let's move the call to drm_atomic_print_new_state() to
drm_atomic_commit() to make sure we don't miss any. Non-blocking commits
were never logged though, and it would create too much churn in the logs
to do so, so leave them out for now.

Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://lore.kernel.org/r/20220328124304.2309418-2-maxime@cerno.tech
parent d049a24b

drivers/gpu/drm/drm_atomic.c

+4 −0
Original line number Diff line number Diff line
@@ -1423,8 +1423,12 @@ EXPORT_SYMBOL(drm_atomic_check_only); 
int drm_atomic_commit(struct drm_atomic_state *state)

{

	struct drm_mode_config *config = &state->dev->mode_config;

	struct drm_printer p = drm_info_printer(state->dev->dev);

	int ret;



	if (drm_debug_enabled(DRM_UT_STATE))

		drm_atomic_print_new_state(state, &p);



	ret = drm_atomic_check_only(state);

	if (ret)

		return ret;

drivers/gpu/drm/drm_atomic_uapi.c

+0 −4
Original line number Diff line number Diff line
@@ -1326,7 +1326,6 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, 
	struct drm_out_fence_state *fence_state;

	int ret = 0;

	unsigned int i, j, num_fences;

	struct drm_printer p = drm_info_printer(dev->dev);



	/* disallow for drivers not supporting atomic: */

	if (!drm_core_check_feature(dev, DRIVER_ATOMIC))
@@ -1458,9 +1457,6 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, 
	} else if (arg->flags & DRM_MODE_ATOMIC_NONBLOCK) {

		ret = drm_atomic_nonblocking_commit(state);

	} else {

		if (drm_debug_enabled(DRM_UT_STATE))

			drm_atomic_print_new_state(state, &p);



		ret = drm_atomic_commit(state);

	}