Remove non-blocking flag on modesetting commits

This seems to make hotplugging DisplayPort MST connectors more reliable.
This commit is contained in:
Scott Anderson 2017-09-10 00:13:39 +12:00
parent 6717b78bd6
commit 1682c0d983

View file

@ -48,7 +48,7 @@ static bool atomic_commit(int drm_fd, struct atomic *atom,
return false; return false;
} }
uint32_t flags = DRM_MODE_PAGE_FLIP_EVENT | DRM_MODE_ATOMIC_NONBLOCK | flag; uint32_t flags = DRM_MODE_PAGE_FLIP_EVENT | flag;
int ret = drmModeAtomicCommit(drm_fd, atom->req, flags, output); int ret = drmModeAtomicCommit(drm_fd, atom->req, flags, output);
if (ret) { if (ret) {
@ -117,7 +117,7 @@ static bool atomic_crtc_pageflip(struct wlr_drm_backend *backend,
atomic_add(&atom, crtc->id, crtc->props.active, 1); atomic_add(&atom, crtc->id, crtc->props.active, 1);
set_plane_props(&atom, crtc->primary, crtc->id, fb_id, true); set_plane_props(&atom, crtc->primary, crtc->id, fb_id, true);
return atomic_commit(backend->fd, &atom, return atomic_commit(backend->fd, &atom,
output, mode ? DRM_MODE_ATOMIC_ALLOW_MODESET : 0); output, mode ? DRM_MODE_ATOMIC_ALLOW_MODESET : DRM_MODE_ATOMIC_NONBLOCK);
} }
static void atomic_conn_enable(struct wlr_drm_backend *backend, static void atomic_conn_enable(struct wlr_drm_backend *backend,