From a585072ff8440d928032860b551866591f48c4df Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sun, 12 Mar 2023 16:04:12 -0500 Subject: [PATCH] Just log if atomic commit fails --- src/video/rk.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/video/rk.c b/src/video/rk.c index 3d9f3a2..aebc4b4 100644 --- a/src/video/rk.c +++ b/src/video/rk.c @@ -188,7 +188,11 @@ void *display_thread(void *param) { // Note: DRM_MODE_ATOMIC_ALLOW_MODESET is used because a modeset may be required to switch // between HDR and SDR mode. ret = drmModeAtomicCommit(fd, drm_request, DRM_MODE_ATOMIC_NONBLOCK | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL); - assert(!ret || errno == EBUSY); + if (ret && errno != EBUSY) { + // We can sometimes hit this path for EINVAL when going from HDR->SDR but it + // seems transient, so don't assert if it occurs. + fprintf(stderr, "Commit failed: %d\n", errno); + } } return NULL;