Add support for using the atomic-modesetting API to apply output state. Unlike previous series, this commit does not unflip sprites_are_broken, until further work has been done with assign_planes to make it reliable.
Differential Revision: https://phabricator.freedesktop.org/D1507 Signed-off-by: Daniel Stone <dani...@collabora.com> Co-authored-by: Pekka Paalanen <pekka.paala...@collabora.co.uk> Co-authored-by: Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulia...@collabora.com> Co-authored-by: Derek Foreman <derek.fore...@collabora.co.uk> --- configure.ac | 3 +- libweston/compositor-drm.c | 293 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 288 insertions(+), 8 deletions(-) v9: Use the repaint-grouping infrastructure to flush all changes at once. The legacy API will make implicit state changes for us, e.g. if we have CRTC A -> connector C on entry, then calling drmModeSetCrtc to associate connector C with CRTC B will implicitly disable CRTC A, and so on. Atomic refuses to do this: all state must be explicitly included. In order to make arbitrary reconfigurations work - and in fact, just to have atomic modesetting be atomic - we need a global repaint flush hook. This also required unused-output tracking, which was introduced in previous patches. And finally, this is the rationale for moving property ID tracking from being per-object, to per-object-type: we need to set properties (CRTC ACTIVE and connector CRTC_ID) on objects we do not have backing weston_* structures for. This also relies on an unmerged kernel/libdrm patch to allow us to differentiate between CRTCs for atomic completion events: https://patchwork.kernel.org/patch/7025111/ diff --git a/configure.ac b/configure.ac index 9e2a7a7..2b0df5a 100644 --- a/configure.ac +++ b/configure.ac @@ -206,7 +206,8 @@ AM_CONDITIONAL(ENABLE_DRM_COMPOSITOR, test x$enable_drm_compositor = xyes) if test x$enable_drm_compositor = xyes; then AC_DEFINE([BUILD_DRM_COMPOSITOR], [1], [Build the DRM compositor]) PKG_CHECK_MODULES(DRM_COMPOSITOR, [libudev >= 136 libdrm >= 2.4.30 gbm mtdev >= 1.1.0]) - PKG_CHECK_MODULES(DRM_COMPOSITOR_ATOMIC, [libdrm >= 2.4.62], + # XXX: Will be 2.4.75 ... ? Need page_flip_handler2 + PKG_CHECK_MODULES(DRM_COMPOSITOR_ATOMIC, [libdrm >= 2.4.74], [AC_DEFINE([HAVE_DRM_ATOMIC], 1, [libdrm supports atomic API])], [AC_MSG_WARN([libdrm does not support atomic modesetting, will omit that capability])]) PKG_CHECK_MODULES(DRM_COMPOSITOR_GBM, [gbm >= 10.2], diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c index 9c74286..2d45d95 100644 --- a/libweston/compositor-drm.c +++ b/libweston/compositor-drm.c @@ -379,6 +379,7 @@ struct drm_output { int vblank_pending; int page_flip_pending; + int atomic_complete_pending; int destroy_pending; int disable_pending; int dpms_off_pending; @@ -1385,6 +1386,7 @@ drm_output_assign_state(struct drm_output_state *state, enum drm_output_state_update_mode mode) { struct drm_output *output = state->output; + struct drm_backend *b = to_drm_backend(output->base.compositor); struct drm_plane_state *plane_state; assert(!output->state_last); @@ -1398,6 +1400,9 @@ drm_output_assign_state(struct drm_output_state *state, wl_list_init(&state->link); output->state_cur = state; + if (b->atomic_modeset && mode == DRM_OUTPUT_STATE_UPDATE_ASYNCHRONOUS) + output->atomic_complete_pending = 1; + /* Replace state_cur on each affected plane with the new state, being * careful to dispose of orphaned (but only orphaned) previous state. * If the previous state is not orphaned (still has an output_state @@ -1409,7 +1414,8 @@ drm_output_assign_state(struct drm_output_state *state, drm_plane_state_free(plane->state_cur, true); plane->state_cur = plane_state; - if (mode != DRM_OUTPUT_STATE_UPDATE_ASYNCHRONOUS) + if (mode != DRM_OUTPUT_STATE_UPDATE_ASYNCHRONOUS || + b->atomic_modeset) continue; if (plane->type == WDRM_PLANE_TYPE_OVERLAY) @@ -1700,7 +1706,7 @@ drm_waitvblank_pipe(struct drm_output *output) } static int -drm_output_apply_state(struct drm_output_state *state) +drm_output_apply_state_legacy(struct drm_output_state *state) { struct drm_output *output = state->output; struct drm_backend *backend = to_drm_backend(output->base.compositor); @@ -1862,6 +1868,236 @@ err: return -1; } +#ifdef HAVE_DRM_ATOMIC +static int +crtc_add_prop(drmModeAtomicReq *req, struct drm_output *output, + enum wdrm_crtc_property prop, uint64_t val) +{ + struct drm_backend *b = to_drm_backend(output->base.compositor); + struct drm_property_info *info = &b->props_crtc[prop]; + int ret; + + if (!info) + return -1; + + ret = drmModeAtomicAddProperty(req, output->crtc_id, info->prop_id, + val); + return (ret <= 0) ? -1 : 0; +} + +static int +connector_add_prop(drmModeAtomicReq *req, struct drm_output *output, + enum wdrm_connector_property prop, uint64_t val) +{ + struct drm_backend *b = to_drm_backend(output->base.compositor); + struct drm_property_info *info = &b->props_conn[prop]; + int ret; + + if (!info) + return -1; + + ret = drmModeAtomicAddProperty(req, output->connector_id, + info->prop_id, val); + return (ret <= 0) ? -1 : 0; +} + +static int +plane_add_prop(drmModeAtomicReq *req, struct drm_plane *plane, + enum wdrm_plane_property prop, uint64_t val) +{ + struct drm_backend *b = to_drm_backend(plane->base.compositor); + struct drm_property_info *info = &b->props_plane[prop]; + int ret; + + if (!info) + return -1; + + ret = drmModeAtomicAddProperty(req, plane->plane_id, info->prop_id, + val); + return (ret <= 0) ? -1 : 0; +} + +static int +drm_mode_ensure_blob(struct drm_backend *backend, struct drm_mode *mode) +{ + int ret; + + if (mode->blob_id) + return 0; + + ret = drmModeCreatePropertyBlob(backend->drm.fd, + &mode->mode_info, + sizeof(mode->mode_info), + &mode->blob_id); + if (ret != 0) + weston_log("failed to create mode property blob: %m\n"); + + return ret; +} + +static int +drm_output_apply_state_atomic(struct drm_output_state *state, + drmModeAtomicReq *req, + uint32_t *flags) +{ + struct drm_output *output = state->output; + struct drm_backend *backend = to_drm_backend(output->base.compositor); + struct drm_plane_state *plane_state; + struct drm_mode *current_mode = to_drm_mode(output->base.current_mode); + int ret = 0; + + if (state->dpms != output->state_cur->dpms) + *flags |= DRM_MODE_ATOMIC_ALLOW_MODESET; + + if (state->dpms == WESTON_DPMS_ON) { + ret = drm_mode_ensure_blob(backend, current_mode); + if (ret != 0) + goto err; + + ret |= crtc_add_prop(req, output, WDRM_CRTC_MODE_ID, + current_mode->blob_id); + ret |= crtc_add_prop(req, output, WDRM_CRTC_ACTIVE, 1); + ret |= connector_add_prop(req, output, WDRM_CONNECTOR_CRTC_ID, + output->crtc_id); + } else { + ret |= crtc_add_prop(req, output, WDRM_CRTC_MODE_ID, 0); + ret |= crtc_add_prop(req, output, WDRM_CRTC_ACTIVE, 0); + ret |= connector_add_prop(req, output, WDRM_CONNECTOR_CRTC_ID, + 0); + } + + if (ret != 0) { + weston_log("couldn't set atomic CRTC/connector state\n"); + goto err; + } + + wl_list_for_each(plane_state, &state->plane_list, link) { + struct drm_plane *plane = plane_state->plane; + + ret |= plane_add_prop(req, plane, WDRM_PLANE_FB_ID, + plane_state->fb ? plane_state->fb->fb_id : 0); + ret |= plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, + plane_state->fb ? output->crtc_id : 0); + ret |= plane_add_prop(req, plane, WDRM_PLANE_SRC_X, + plane_state->src_x); + ret |= plane_add_prop(req, plane, WDRM_PLANE_SRC_Y, + plane_state->src_y); + ret |= plane_add_prop(req, plane, WDRM_PLANE_SRC_W, + plane_state->src_w); + ret |= plane_add_prop(req, plane, WDRM_PLANE_SRC_H, + plane_state->src_h); + ret |= plane_add_prop(req, plane, WDRM_PLANE_CRTC_X, + plane_state->dest_x); + ret |= plane_add_prop(req, plane, WDRM_PLANE_CRTC_Y, + plane_state->dest_y); + ret |= plane_add_prop(req, plane, WDRM_PLANE_CRTC_W, + plane_state->dest_w); + ret |= plane_add_prop(req, plane, WDRM_PLANE_CRTC_H, + plane_state->dest_h); + + if (ret != 0) { + weston_log("couldn't set plane state\n"); + goto err; + } + } + + return 0; + +err: + drm_output_state_free(state); + return -1; +} + +static int +drm_pending_state_apply_atomic(struct drm_pending_state *pending_state) +{ + struct drm_backend *b = pending_state->backend; + struct drm_output_state *output_state, *tmp; + drmModeAtomicReq *req = drmModeAtomicAlloc(); + uint32_t *unused; + uint32_t flags = 0; + int ret = 0; + + if (!req) + return -1; + + if (b->state_invalid) { + struct drm_property_info *info; + int err; + + /* If we need to reset all our state (e.g. because we've + * just started, or just been VT-switched in), explicitly + * disable all the CRTCs and connectors we aren't using. */ + wl_array_for_each(unused, &b->unused_connectors) { + info = &b->props_conn[WDRM_CONNECTOR_CRTC_ID]; + err = drmModeAtomicAddProperty(req, *unused, + info->prop_id, 0); + if (err <= 0) + ret = -1; + } + + wl_array_for_each(unused, &b->unused_crtcs) { + drmModeObjectProperties *props; + uint64_t active; + + /* This is ugly; we can't emit a disable on a CRTC + * that's already off, as the kernel will refuse to + * generate an event for an off->off state and fail + * the commit. Instead, we have to go out of our way + * to avoid it here. */ + props = drmModeObjectGetProperties(b->drm.fd, + *unused, + DRM_MODE_OBJECT_CRTC); + if (!props) { + ret = -1; + continue; + } + info = &b->props_crtc[WDRM_CRTC_ACTIVE]; + active = drm_property_get_value(info, props, 0); + drmModeFreeObjectProperties(props); + if (active == 0) + continue; + + err = drmModeAtomicAddProperty(req, *unused, + info->prop_id, 0); + if (err <= 0) + ret = -1; + } + + flags |= DRM_MODE_ATOMIC_ALLOW_MODESET; + } + + wl_list_for_each(output_state, &pending_state->output_list, link) + ret |= drm_output_apply_state_atomic(output_state, req, &flags); + + if (ret != 0) { + weston_log("atomic: couldn't compile atomic state\n"); + goto out; + } + + flags |= DRM_MODE_PAGE_FLIP_EVENT | DRM_MODE_ATOMIC_NONBLOCK; + ret = drmModeAtomicCommit(b->drm.fd, req, flags, b); + if (ret != 0) { + weston_log("atomic: couldn't commit new state: %m\n"); + goto out; + } + + wl_list_for_each_safe(output_state, tmp, &pending_state->output_list, + link) { + drm_output_assign_state(output_state, + DRM_OUTPUT_STATE_UPDATE_ASYNCHRONOUS); + } + + b->state_invalid = false; + + assert(wl_list_empty(&pending_state->output_list)); + +out: + drmModeAtomicFree(req); + return ret; +} +#endif + static int drm_pending_state_apply(struct drm_pending_state *pending_state) { @@ -1869,6 +2105,11 @@ drm_pending_state_apply(struct drm_pending_state *pending_state) struct drm_output_state *output_state, *tmp; uint32_t *unused; +#ifdef HAVE_DRM_ATOMIC + if (b->atomic_modeset) + return drm_pending_state_apply_atomic(pending_state); +#endif + if (b->state_invalid) { /* If we need to reset all our state (e.g. because we've * just started, or just been VT-switched in), explicitly @@ -1885,7 +2126,7 @@ drm_pending_state_apply(struct drm_pending_state *pending_state) struct drm_output *output = output_state->output; int ret; - ret = drm_output_apply_state(output_state); + ret = drm_output_apply_state_legacy(output_state); if (ret != 0) { weston_log("Couldn't apply state for output %s\n", output->base.name); @@ -2037,9 +2278,12 @@ vblank_handler(int fd, unsigned int frame, unsigned int sec, unsigned int usec, struct drm_plane_state *ps = (struct drm_plane_state *) data; struct drm_output_state *os = ps->output_state; struct drm_output *output = os->output; + struct drm_backend *b = to_drm_backend(output->base.compositor); uint32_t flags = WP_PRESENTATION_FEEDBACK_KIND_HW_COMPLETION | WP_PRESENTATION_FEEDBACK_KIND_HW_CLOCK; + assert(!b->atomic_modeset); + drm_output_update_msc(output, frame); output->vblank_pending--; assert(output->vblank_pending >= 0); @@ -2057,12 +2301,14 @@ page_flip_handler(int fd, unsigned int frame, unsigned int sec, unsigned int usec, void *data) { struct drm_output *output = data; + struct drm_backend *b = to_drm_backend(output->base.compositor); uint32_t flags = WP_PRESENTATION_FEEDBACK_KIND_VSYNC | WP_PRESENTATION_FEEDBACK_KIND_HW_COMPLETION | WP_PRESENTATION_FEEDBACK_KIND_HW_CLOCK; drm_output_update_msc(output, frame); + assert(!b->atomic_modeset); assert(output->page_flip_pending); output->page_flip_pending = 0; @@ -2127,6 +2373,31 @@ drm_repaint_cancel(struct weston_compositor *compositor, void *repaint_data) b->repaint_data = NULL; } +static void +atomic_flip_handler(int fd, unsigned int crtc_id, unsigned int frame, + unsigned int sec, unsigned int usec, void *data) +{ + struct drm_backend *b = data; + struct drm_output *output = drm_output_find_by_crtc(b, crtc_id); + uint32_t flags = WP_PRESENTATION_FEEDBACK_KIND_VSYNC | + WP_PRESENTATION_FEEDBACK_KIND_HW_COMPLETION | + WP_PRESENTATION_FEEDBACK_KIND_HW_CLOCK; + + /* During the initial modeset, we can disable CRTCs which we don't + * actually handle during normal operation; this will give us events + * for unknown outputs. Ignore them. */ + if (!output) + return; + + drm_output_update_msc(output, frame); + + assert(b->atomic_modeset); + assert(output->atomic_complete_pending); + output->atomic_complete_pending = 0; + + drm_output_update_complete(output, flags, sec, usec); +} + static uint32_t drm_output_check_plane_format(struct drm_plane *p, struct weston_view *ev, struct gbm_bo *bo) @@ -2758,11 +3029,17 @@ drm_output_switch_mode(struct weston_output *output_base, struct weston_mode *mo static int on_drm_input(int fd, uint32_t mask, void *data) { + struct drm_backend *b = data; drmEventContext evctx; memset(&evctx, 0, sizeof evctx); - evctx.version = DRM_EVENT_CONTEXT_VERSION; - evctx.page_flip_handler = page_flip_handler; + evctx.version = 3; +#ifdef HAVE_DRM_ATOMIC + if (b->atomic_modeset) + evctx.page_flip_handler2 = atomic_flip_handler; + else +#endif + evctx.page_flip_handler = page_flip_handler; evctx.vblank_handler = vblank_handler; drmHandleEvent(fd, &evctx); @@ -4097,7 +4374,8 @@ drm_output_destroy(struct weston_output *base) struct drm_backend *b = to_drm_backend(base->compositor); struct drm_mode *drm_mode, *next; - if (output->page_flip_pending || output->vblank_pending) { + if (output->page_flip_pending || output->vblank_pending || + output->atomic_complete_pending) { output->destroy_pending = 1; weston_log("destroy output while page flip pending\n"); return; @@ -4132,7 +4410,8 @@ drm_output_disable(struct weston_output *base) uint32_t *unused; int ret; - if (output->page_flip_pending || output->vblank_pending) { + if (output->page_flip_pending || output->vblank_pending || + output->atomic_complete_pending) { output->disable_pending = 1; return -1; } -- 2.9.3 _______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/wayland-devel
