--- x/drivers/gpu/drm/drm_client_modeset.c
+++ y/drivers/gpu/drm/drm_client_modeset.c
@@ -1062,6 +1062,8 @@ out_ctx:
 	return ret;
 
 backoff:
+	if (state->commit_work.func)
+		cancel_work_sync(&state->commit_work);
 	drm_atomic_state_clear(state);
 	drm_modeset_backoff(&ctx);