X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=src%2Floader%2Floader_dri3_helper.c;h=e49b39e7d86c0722f3c2ba15e315623eda86c619;hp=1c93e7a96d397ef6b00d0cbb7087b74b3fe85ea3;hb=272f9cfe6a19212354c89dc443959473ac5d398e;hpb=81fb1547772d42c527318837d4207ecdb6899e5d diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c index 1c93e7a96d3..e49b39e7d86 100644 --- a/src/loader/loader_dri3_helper.c +++ b/src/loader/loader_dri3_helper.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -33,6 +34,8 @@ #include #include "loader_dri3_helper.h" +#include "util/macros.h" +#include "drm-uapi/drm_fourcc.h" /* From xmlpool/options.h, user exposed so should be stable */ #define DRI_CONF_VBLANK_NEVER 0 @@ -40,6 +43,202 @@ #define DRI_CONF_VBLANK_DEF_INTERVAL_1 2 #define DRI_CONF_VBLANK_ALWAYS_SYNC 3 +/** + * A cached blit context. + */ +struct loader_dri3_blit_context { + mtx_t mtx; + __DRIcontext *ctx; + __DRIscreen *cur_screen; + const __DRIcoreExtension *core; +}; + +/* For simplicity we maintain the cache only for a single screen at a time */ +static struct loader_dri3_blit_context blit_context = { + _MTX_INITIALIZER_NP, NULL +}; + +static void +dri3_flush_present_events(struct loader_dri3_drawable *draw); + +static struct loader_dri3_buffer * +dri3_find_back_alloc(struct loader_dri3_drawable *draw); + +static xcb_screen_t * +get_screen_for_root(xcb_connection_t *conn, xcb_window_t root) +{ + xcb_screen_iterator_t screen_iter = + xcb_setup_roots_iterator(xcb_get_setup(conn)); + + for (; screen_iter.rem; xcb_screen_next (&screen_iter)) { + if (screen_iter.data->root == root) + return screen_iter.data; + } + + return NULL; +} + +static xcb_visualtype_t * +get_xcb_visualtype_for_depth(struct loader_dri3_drawable *draw, int depth) +{ + xcb_visualtype_iterator_t visual_iter; + xcb_screen_t *screen = draw->screen; + xcb_depth_iterator_t depth_iter; + + if (!screen) + return NULL; + + depth_iter = xcb_screen_allowed_depths_iterator(screen); + for (; depth_iter.rem; xcb_depth_next(&depth_iter)) { + if (depth_iter.data->depth != depth) + continue; + + visual_iter = xcb_depth_visuals_iterator(depth_iter.data); + if (visual_iter.rem) + return visual_iter.data; + } + + return NULL; +} + +/* Sets the adaptive sync window property state. */ +static void +set_adaptive_sync_property(xcb_connection_t *conn, xcb_drawable_t drawable, + uint32_t state) +{ + static char const name[] = "_VARIABLE_REFRESH"; + xcb_intern_atom_cookie_t cookie; + xcb_intern_atom_reply_t* reply; + xcb_void_cookie_t check; + + cookie = xcb_intern_atom(conn, 0, strlen(name), name); + reply = xcb_intern_atom_reply(conn, cookie, NULL); + if (reply == NULL) + return; + + if (state) + check = xcb_change_property_checked(conn, XCB_PROP_MODE_REPLACE, + drawable, reply->atom, + XCB_ATOM_CARDINAL, 32, 1, &state); + else + check = xcb_delete_property_checked(conn, drawable, reply->atom); + + xcb_discard_reply(conn, check.sequence); + free(reply); +} + +/* Get red channel mask for given drawable at given depth. */ +static unsigned int +dri3_get_red_mask_for_depth(struct loader_dri3_drawable *draw, int depth) +{ + xcb_visualtype_t *visual = get_xcb_visualtype_for_depth(draw, depth); + + if (visual) + return visual->red_mask; + + return 0; +} + +/** + * Do we have blit functionality in the image blit extension? + * + * \param draw[in] The drawable intended to blit from / to. + * \return true if we have blit functionality. false otherwise. + */ +static bool loader_dri3_have_image_blit(const struct loader_dri3_drawable *draw) +{ + return draw->ext->image->base.version >= 9 && + draw->ext->image->blitImage != NULL; +} + +/** + * Get and lock (for use with the current thread) a dri context associated + * with the drawable's dri screen. The context is intended to be used with + * the dri image extension's blitImage method. + * + * \param draw[in] Pointer to the drawable whose dri screen we want a + * dri context for. + * \return A dri context or NULL if context creation failed. + * + * When the caller is done with the context (even if the context returned was + * NULL), the caller must call loader_dri3_blit_context_put. + */ +static __DRIcontext * +loader_dri3_blit_context_get(struct loader_dri3_drawable *draw) +{ + mtx_lock(&blit_context.mtx); + + if (blit_context.ctx && blit_context.cur_screen != draw->dri_screen) { + blit_context.core->destroyContext(blit_context.ctx); + blit_context.ctx = NULL; + } + + if (!blit_context.ctx) { + blit_context.ctx = draw->ext->core->createNewContext(draw->dri_screen, + NULL, NULL, NULL); + blit_context.cur_screen = draw->dri_screen; + blit_context.core = draw->ext->core; + } + + return blit_context.ctx; +} + +/** + * Release (for use with other threads) a dri context previously obtained using + * loader_dri3_blit_context_get. + */ +static void +loader_dri3_blit_context_put(void) +{ + mtx_unlock(&blit_context.mtx); +} + +/** + * Blit (parts of) the contents of a DRI image to another dri image + * + * \param draw[in] The drawable which owns the images. + * \param dst[in] The destination image. + * \param src[in] The source image. + * \param dstx0[in] Start destination coordinate. + * \param dsty0[in] Start destination coordinate. + * \param width[in] Blit width. + * \param height[in] Blit height. + * \param srcx0[in] Start source coordinate. + * \param srcy0[in] Start source coordinate. + * \param flush_flag[in] Image blit flush flag. + * \return true iff successful. + */ +static bool +loader_dri3_blit_image(struct loader_dri3_drawable *draw, + __DRIimage *dst, __DRIimage *src, + int dstx0, int dsty0, int width, int height, + int srcx0, int srcy0, int flush_flag) +{ + __DRIcontext *dri_context; + bool use_blit_context = false; + + if (!loader_dri3_have_image_blit(draw)) + return false; + + dri_context = draw->vtable->get_dri_context(draw); + + if (!dri_context || !draw->vtable->in_current_context(draw)) { + dri_context = loader_dri3_blit_context_get(draw); + use_blit_context = true; + flush_flag |= __BLIT_FLAG_FLUSH; + } + + if (dri_context) + draw->ext->image->blitImage(dri_context, dst, src, dstx0, dsty0, + width, height, srcx0, srcy0, + width, height, flush_flag); + + if (use_blit_context) + loader_dri3_blit_context_put(); + + return dri_context != NULL; +} + static inline void dri3_fence_reset(xcb_connection_t *c, struct loader_dri3_buffer *buffer) { @@ -59,16 +258,22 @@ dri3_fence_trigger(xcb_connection_t *c, struct loader_dri3_buffer *buffer) } static inline void -dri3_fence_await(xcb_connection_t *c, struct loader_dri3_buffer *buffer) +dri3_fence_await(xcb_connection_t *c, struct loader_dri3_drawable *draw, + struct loader_dri3_buffer *buffer) { xcb_flush(c); xshmfence_await(buffer->shm_fence); + if (draw) { + mtx_lock(&draw->mtx); + dri3_flush_present_events(draw); + mtx_unlock(&draw->mtx); + } } static void dri3_update_num_back(struct loader_dri3_drawable *draw) { - if (draw->flipping) + if (draw->last_present_mode == XCB_PRESENT_COMPLETE_MODE_FLIP) draw->num_back = 3; else draw->num_back = 2; @@ -77,9 +282,7 @@ dri3_update_num_back(struct loader_dri3_drawable *draw) void loader_dri3_set_swap_interval(struct loader_dri3_drawable *draw, int interval) { - interval = draw->vtable->clamp_swap_interval(draw, interval); - draw->vtable->set_swap_interval(draw, interval); - dri3_update_num_back(draw); + draw->swap_interval = interval; } /** dri3_free_render_buffer @@ -108,7 +311,7 @@ loader_dri3_drawable_fini(struct loader_dri3_drawable *draw) draw->ext->core->destroyDrawable(draw->dri_drawable); - for (i = 0; i < LOADER_DRI3_NUM_BUFFERS; i++) { + for (i = 0; i < ARRAY_SIZE(draw->buffers); i++) { if (draw->buffers[i]) dri3_free_render_buffer(draw, draw->buffers[i]); } @@ -121,6 +324,9 @@ loader_dri3_drawable_fini(struct loader_dri3_drawable *draw) xcb_discard_reply(draw->conn, cookie.sequence); xcb_unregister_for_special_event(draw->conn, draw->special_event); } + + cnd_destroy(&draw->event_cnd); + mtx_destroy(&draw->mtx); } int @@ -128,6 +334,7 @@ loader_dri3_drawable_init(xcb_connection_t *conn, xcb_drawable_t drawable, __DRIscreen *dri_screen, bool is_different_gpu, + bool multiplanes_available, const __DRIconfig *dri_config, struct loader_dri3_extensions *ext, const struct loader_dri3_vtable *vtable, @@ -145,15 +352,35 @@ loader_dri3_drawable_init(xcb_connection_t *conn, draw->drawable = drawable; draw->dri_screen = dri_screen; draw->is_different_gpu = is_different_gpu; + draw->multiplanes_available = multiplanes_available; draw->have_back = 0; draw->have_fake_front = 0; draw->first_init = true; + draw->adaptive_sync = false; + draw->adaptive_sync_active = false; + + draw->cur_blit_source = -1; + draw->back_format = __DRI_IMAGE_FORMAT_NONE; + mtx_init(&draw->mtx, mtx_plain); + cnd_init(&draw->event_cnd); + + if (draw->ext->config) { + unsigned char adaptive_sync = 0; - if (draw->ext->config) draw->ext->config->configQueryi(draw->dri_screen, "vblank_mode", &vblank_mode); + draw->ext->config->configQueryb(draw->dri_screen, + "adaptive_sync", + &adaptive_sync); + + draw->adaptive_sync = adaptive_sync; + } + + if (!draw->adaptive_sync) + set_adaptive_sync_property(conn, draw->drawable, false); + switch (vblank_mode) { case DRI_CONF_VBLANK_NEVER: case DRI_CONF_VBLANK_DEF_INTERVAL_0: @@ -165,7 +392,7 @@ loader_dri3_drawable_init(xcb_connection_t *conn, swap_interval = 1; break; } - draw->vtable->set_swap_interval(draw, swap_interval); + draw->swap_interval = swap_interval; dri3_update_num_back(draw); @@ -185,12 +412,20 @@ loader_dri3_drawable_init(xcb_connection_t *conn, return 1; } + draw->screen = get_screen_for_root(draw->conn, reply->root); draw->width = reply->width; draw->height = reply->height; draw->depth = reply->depth; draw->vtable->set_drawable_size(draw, draw->width, draw->height); free(reply); + draw->swap_method = __DRI_ATTRIB_SWAP_UNDEFINED; + if (draw->ext->core->base.version >= 2) { + (void )draw->ext->core->getConfigAttrib(dri_config, + __DRI_ATTRIB_SWAP_METHOD, + &draw->swap_method); + } + /* * Make sure server has the same swap interval we do for the new * drawable. @@ -214,6 +449,7 @@ dri3_handle_present_event(struct loader_dri3_drawable *draw, draw->width = ce->width; draw->height = ce->height; draw->vtable->set_drawable_size(draw, draw->width, draw->height); + draw->ext->flush->invalidate(draw->dri_drawable); break; } case XCB_PRESENT_COMPLETE_NOTIFY: { @@ -224,26 +460,50 @@ dri3_handle_present_event(struct loader_dri3_drawable *draw, * checking for wrap. */ if (ce->kind == XCB_PRESENT_COMPLETE_KIND_PIXMAP) { - draw->recv_sbc = (draw->send_sbc & 0xffffffff00000000LL) | ce->serial; - if (draw->recv_sbc > draw->send_sbc) - draw->recv_sbc -= 0x100000000; - switch (ce->mode) { - case XCB_PRESENT_COMPLETE_MODE_FLIP: - draw->flipping = true; - break; - case XCB_PRESENT_COMPLETE_MODE_COPY: - draw->flipping = false; - break; + uint64_t recv_sbc = (draw->send_sbc & 0xffffffff00000000LL) | ce->serial; + + /* Only assume wraparound if that results in exactly the previous + * SBC + 1, otherwise ignore received SBC > sent SBC (those are + * probably from a previous loader_dri3_drawable instance) to avoid + * calculating bogus target MSC values in loader_dri3_swap_buffers_msc + */ + if (recv_sbc <= draw->send_sbc) + draw->recv_sbc = recv_sbc; + else if (recv_sbc == (draw->recv_sbc + 0x100000001ULL)) + draw->recv_sbc = recv_sbc - 0x100000000ULL; + + /* When moving from flip to copy, we assume that we can allocate in + * a more optimal way if we don't need to cater for the display + * controller. + */ + if (ce->mode == XCB_PRESENT_COMPLETE_MODE_COPY && + draw->last_present_mode == XCB_PRESENT_COMPLETE_MODE_FLIP) { + for (int b = 0; b < ARRAY_SIZE(draw->buffers); b++) { + if (draw->buffers[b]) + draw->buffers[b]->reallocate = true; + } + } + + /* If the server tells us that our allocation is suboptimal, we + * reallocate once. + */ +#ifdef HAVE_DRI3_MODIFIERS + if (ce->mode == XCB_PRESENT_COMPLETE_MODE_SUBOPTIMAL_COPY && + draw->last_present_mode != ce->mode) { + for (int b = 0; b < ARRAY_SIZE(draw->buffers); b++) { + if (draw->buffers[b]) + draw->buffers[b]->reallocate = true; + } } - dri3_update_num_back(draw); +#endif + draw->last_present_mode = ce->mode; if (draw->vtable->show_fps) draw->vtable->show_fps(draw, ce->ust); draw->ust = ce->ust; draw->msc = ce->msc; - } else { - draw->recv_msc_serial = ce->serial; + } else if (ce->serial == draw->eid) { draw->notify_ust = ce->ust; draw->notify_msc = ce->msc; } @@ -253,17 +513,11 @@ dri3_handle_present_event(struct loader_dri3_drawable *draw, xcb_present_idle_notify_event_t *ie = (void *) ge; int b; - for (b = 0; b < sizeof(draw->buffers) / sizeof(draw->buffers[0]); b++) { + for (b = 0; b < ARRAY_SIZE(draw->buffers); b++) { struct loader_dri3_buffer *buf = draw->buffers[b]; - if (buf && buf->pixmap == ie->pixmap) { + if (buf && buf->pixmap == ie->pixmap) buf->busy = 0; - if (draw->num_back <= b && b < LOADER_DRI3_MAX_BACK) { - dri3_free_render_buffer(draw, buf); - draw->buffers[b] = NULL; - } - break; - } } break; } @@ -272,13 +526,27 @@ dri3_handle_present_event(struct loader_dri3_drawable *draw, } static bool -dri3_wait_for_event(struct loader_dri3_drawable *draw) +dri3_wait_for_event_locked(struct loader_dri3_drawable *draw) { xcb_generic_event_t *ev; xcb_present_generic_event_t *ge; xcb_flush(draw->conn); - ev = xcb_wait_for_special_event(draw->conn, draw->special_event); + + /* Only have one thread waiting for events at a time */ + if (draw->has_event_waiter) { + cnd_wait(&draw->event_cnd, &draw->mtx); + /* Another thread has updated the protected info, so retest. */ + return true; + } else { + draw->has_event_waiter = true; + /* Allow other threads access to the drawable while we're waiting. */ + mtx_unlock(&draw->mtx); + ev = xcb_wait_for_special_event(draw->conn, draw->special_event); + mtx_lock(&draw->mtx); + draw->has_event_waiter = false; + cnd_broadcast(&draw->event_cnd); + } if (!ev) return false; ge = (void *) ev; @@ -297,29 +565,34 @@ loader_dri3_wait_for_msc(struct loader_dri3_drawable *draw, int64_t divisor, int64_t remainder, int64_t *ust, int64_t *msc, int64_t *sbc) { - uint32_t msc_serial; - - msc_serial = ++draw->send_msc_serial; - xcb_present_notify_msc(draw->conn, - draw->drawable, - msc_serial, - target_msc, - divisor, - remainder); + xcb_void_cookie_t cookie = xcb_present_notify_msc(draw->conn, + draw->drawable, + draw->eid, + target_msc, + divisor, + remainder); + xcb_generic_event_t *ev; + unsigned full_sequence; + mtx_lock(&draw->mtx); xcb_flush(draw->conn); /* Wait for the event */ - if (draw->special_event) { - while ((int32_t) (msc_serial - draw->recv_msc_serial) > 0) { - if (!dri3_wait_for_event(draw)) - return false; + do { + ev = xcb_wait_for_special_event(draw->conn, draw->special_event); + if (!ev) { + mtx_unlock(&draw->mtx); + return false; } - } + + full_sequence = ev->full_sequence; + dri3_handle_present_event(draw, (void *) ev); + } while (full_sequence != cookie.sequence || draw->notify_msc < target_msc); *ust = draw->notify_ust; *msc = draw->notify_msc; *sbc = draw->recv_sbc; + mtx_unlock(&draw->mtx); return true; } @@ -341,17 +614,21 @@ loader_dri3_wait_for_sbc(struct loader_dri3_drawable *draw, * swaps requested with glXSwapBuffersMscOML for that window have * completed." */ + mtx_lock(&draw->mtx); if (!target_sbc) target_sbc = draw->send_sbc; while (draw->recv_sbc < target_sbc) { - if (!dri3_wait_for_event(draw)) + if (!dri3_wait_for_event_locked(draw)) { + mtx_unlock(&draw->mtx); return 0; + } } *ust = draw->ust; *msc = draw->msc; *sbc = draw->recv_sbc; + mtx_unlock(&draw->mtx); return 1; } @@ -364,25 +641,36 @@ static int dri3_find_back(struct loader_dri3_drawable *draw) { int b; - xcb_generic_event_t *ev; - xcb_present_generic_event_t *ge; + int num_to_consider; + + mtx_lock(&draw->mtx); + /* Increase the likelyhood of reusing current buffer */ + dri3_flush_present_events(draw); + + /* Check whether we need to reuse the current back buffer as new back. + * In that case, wait until it's not busy anymore. + */ + num_to_consider = draw->num_back; + if (!loader_dri3_have_image_blit(draw) && draw->cur_blit_source != -1) { + num_to_consider = 1; + draw->cur_blit_source = -1; + } for (;;) { - for (b = 0; b < draw->num_back; b++) { + for (b = 0; b < num_to_consider; b++) { int id = LOADER_DRI3_BACK_ID((b + draw->cur_back) % draw->num_back); struct loader_dri3_buffer *buffer = draw->buffers[id]; if (!buffer || !buffer->busy) { draw->cur_back = id; + mtx_unlock(&draw->mtx); return id; } } - xcb_flush(draw->conn); - ev = xcb_wait_for_special_event(draw->conn, draw->special_event); - if (!ev) + if (!dri3_wait_for_event_locked(draw)) { + mtx_unlock(&draw->mtx); return -1; - ge = (void *) ev; - dri3_handle_present_event(draw, ge); + } } } @@ -468,9 +756,6 @@ loader_dri3_copy_sub_buffer(struct loader_dri3_drawable *draw, { struct loader_dri3_buffer *back; unsigned flags = __DRI2_FLUSH_DRAWABLE; - __DRIcontext *dri_context; - - dri_context = draw->vtable->get_dri_context(draw); /* Check we have the right attachments */ if (!draw->have_back || draw->is_pixmap) @@ -480,33 +765,27 @@ loader_dri3_copy_sub_buffer(struct loader_dri3_drawable *draw, flags |= __DRI2_FLUSH_CONTEXT; loader_dri3_flush(draw, flags, __DRI2_THROTTLE_SWAPBUFFER); - back = dri3_back_buffer(draw); + back = dri3_find_back_alloc(draw); + if (!back) + return; + y = draw->height - y - height; - if (draw->is_different_gpu && draw->vtable->in_current_context(draw)) { + if (draw->is_different_gpu) { /* Update the linear buffer part of the back buffer * for the dri3_copy_area operation */ - draw->ext->image->blitImage(dri_context, - back->linear_buffer, - back->image, - 0, 0, back->width, - back->height, - 0, 0, back->width, - back->height, __BLIT_FLAG_FLUSH); - /* We use blitImage to update our fake front, - */ - if (draw->have_fake_front) - draw->ext->image->blitImage(dri_context, - dri3_fake_front_buffer(draw)->image, - back->image, - x, y, width, height, - x, y, width, height, __BLIT_FLAG_FLUSH); + (void) loader_dri3_blit_image(draw, + back->linear_buffer, + back->image, + 0, 0, back->width, back->height, + 0, 0, __BLIT_FLAG_FLUSH); } + loader_dri3_swapbuffer_barrier(draw); dri3_fence_reset(draw->conn, back); dri3_copy_area(draw->conn, - dri3_back_buffer(draw)->pixmap, + back->pixmap, draw->drawable, dri3_drawable_gc(draw), x, y, x, y, width, height); @@ -514,17 +793,23 @@ loader_dri3_copy_sub_buffer(struct loader_dri3_drawable *draw, /* Refresh the fake front (if present) after we just damaged the real * front. */ - if (draw->have_fake_front && !draw->is_different_gpu) { + if (draw->have_fake_front && + !loader_dri3_blit_image(draw, + dri3_fake_front_buffer(draw)->image, + back->image, + x, y, width, height, + x, y, __BLIT_FLAG_FLUSH) && + !draw->is_different_gpu) { dri3_fence_reset(draw->conn, dri3_fake_front_buffer(draw)); dri3_copy_area(draw->conn, - dri3_back_buffer(draw)->pixmap, + back->pixmap, dri3_fake_front_buffer(draw)->pixmap, dri3_drawable_gc(draw), x, y, x, y, width, height); dri3_fence_trigger(draw->conn, dri3_fake_front_buffer(draw)); - dri3_fence_await(draw->conn, dri3_fake_front_buffer(draw)); + dri3_fence_await(draw->conn, NULL, dri3_fake_front_buffer(draw)); } - dri3_fence_await(draw->conn, back); + dri3_fence_await(draw->conn, draw, back); } void @@ -540,20 +825,18 @@ loader_dri3_copy_drawable(struct loader_dri3_drawable *draw, dri3_drawable_gc(draw), 0, 0, 0, 0, draw->width, draw->height); dri3_fence_trigger(draw->conn, dri3_fake_front_buffer(draw)); - dri3_fence_await(draw->conn, dri3_fake_front_buffer(draw)); + dri3_fence_await(draw->conn, draw, dri3_fake_front_buffer(draw)); } void loader_dri3_wait_x(struct loader_dri3_drawable *draw) { struct loader_dri3_buffer *front; - __DRIcontext *dri_context; if (draw == NULL || !draw->have_fake_front) return; front = dri3_fake_front_buffer(draw); - dri_context = draw->vtable->get_dri_context(draw); loader_dri3_copy_drawable(draw, front->pixmap, draw->drawable); @@ -562,39 +845,34 @@ loader_dri3_wait_x(struct loader_dri3_drawable *draw) * Copy back to the tiled buffer we use for rendering. * Note that we don't need flushing. */ - if (draw->is_different_gpu && draw->vtable->in_current_context(draw)) - draw->ext->image->blitImage(dri_context, - front->image, - front->linear_buffer, - 0, 0, front->width, - front->height, - 0, 0, front->width, - front->height, 0); + if (draw->is_different_gpu) + (void) loader_dri3_blit_image(draw, + front->image, + front->linear_buffer, + 0, 0, front->width, front->height, + 0, 0, 0); } void loader_dri3_wait_gl(struct loader_dri3_drawable *draw) { struct loader_dri3_buffer *front; - __DRIcontext *dri_context; if (draw == NULL || !draw->have_fake_front) return; front = dri3_fake_front_buffer(draw); - dri_context = draw->vtable->get_dri_context(draw); /* In the psc->is_different_gpu case, we update the linear_buffer * before updating the real front. */ - if (draw->is_different_gpu && draw->vtable->in_current_context(draw)) - draw->ext->image->blitImage(dri_context, - front->linear_buffer, - front->image, - 0, 0, front->width, - front->height, - 0, 0, front->width, - front->height, __BLIT_FLAG_FLUSH); + if (draw->is_different_gpu) + (void) loader_dri3_blit_image(draw, + front->linear_buffer, + front->image, + 0, 0, front->width, front->height, + 0, 0, __BLIT_FLAG_FLUSH); + loader_dri3_swapbuffer_barrier(draw); loader_dri3_copy_drawable(draw, draw->drawable, front->pixmap); } @@ -608,6 +886,9 @@ dri3_flush_present_events(struct loader_dri3_drawable *draw) /* Check to see if any configuration changes have occurred * since we were last invoked */ + if (draw->has_event_waiter) + return; + if (draw->special_event) { xcb_generic_event_t *ev; @@ -630,34 +911,48 @@ loader_dri3_swap_buffers_msc(struct loader_dri3_drawable *draw, bool force_copy) { struct loader_dri3_buffer *back; - __DRIcontext *dri_context; int64_t ret = 0; uint32_t options = XCB_PRESENT_OPTION_NONE; - int swap_interval; - - dri_context = draw->vtable->get_dri_context(draw); - swap_interval = draw->vtable->get_swap_interval(draw); draw->vtable->flush_drawable(draw, flush_flags); - back = draw->buffers[dri3_find_back(draw)]; + back = dri3_find_back_alloc(draw); + + mtx_lock(&draw->mtx); + + if (draw->adaptive_sync && !draw->adaptive_sync_active) { + set_adaptive_sync_property(draw->conn, draw->drawable, true); + draw->adaptive_sync_active = true; + } + if (draw->is_different_gpu && back) { /* Update the linear buffer before presenting the pixmap */ - draw->ext->image->blitImage(dri_context, - back->linear_buffer, - back->image, - 0, 0, back->width, - back->height, - 0, 0, back->width, - back->height, __BLIT_FLAG_FLUSH); - /* Update the fake front */ - if (draw->have_fake_front) - draw->ext->image->blitImage(dri_context, - draw->buffers[LOADER_DRI3_FRONT_ID]->image, - back->image, - 0, 0, draw->width, draw->height, - 0, 0, draw->width, draw->height, - __BLIT_FLAG_FLUSH); + (void) loader_dri3_blit_image(draw, + back->linear_buffer, + back->image, + 0, 0, back->width, back->height, + 0, 0, __BLIT_FLAG_FLUSH); + } + + /* If we need to preload the new back buffer, remember the source. + * The force_copy parameter is used by EGL to attempt to preserve + * the back buffer across a call to this function. + */ + if (draw->swap_method != __DRI_ATTRIB_SWAP_UNDEFINED || force_copy) + draw->cur_blit_source = LOADER_DRI3_BACK_ID(draw->cur_back); + + /* Exchange the back and fake front. Even though the server knows about these + * buffers, it has no notion of back and fake front. + */ + if (back && draw->have_fake_front) { + struct loader_dri3_buffer *tmp; + + tmp = dri3_fake_front_buffer(draw); + draw->buffers[LOADER_DRI3_FRONT_ID] = back; + draw->buffers[LOADER_DRI3_BACK_ID(draw->cur_back)] = tmp; + + if (draw->swap_method == __DRI_ATTRIB_SWAP_COPY || force_copy) + draw->cur_blit_source = LOADER_DRI3_FRONT_ID; } dri3_flush_present_events(draw); @@ -672,7 +967,7 @@ loader_dri3_swap_buffers_msc(struct loader_dri3_drawable *draw, */ ++draw->send_sbc; if (target_msc == 0 && divisor == 0 && remainder == 0) - target_msc = draw->msc + swap_interval * + target_msc = draw->msc + draw->swap_interval * (draw->send_sbc - draw->recv_sbc); else if (divisor == 0 && remainder > 0) { /* From the GLX_OML_sync_control spec: @@ -696,11 +991,19 @@ loader_dri3_swap_buffers_msc(struct loader_dri3_drawable *draw, * behaviour by not using XCB_PRESENT_OPTION_ASYNC, but this should not be * the default. */ - if (swap_interval == 0) + if (draw->swap_interval == 0) options |= XCB_PRESENT_OPTION_ASYNC; - if (force_copy) - options |= XCB_PRESENT_OPTION_COPY; + /* If we need to populate the new back, but need to reuse the back + * buffer slot due to lack of local blit capabilities, make sure + * the server doesn't flip and we deadlock. + */ + if (!loader_dri3_have_image_blit(draw) && draw->cur_blit_source != -1) + options |= XCB_PRESENT_OPTION_COPY; +#ifdef HAVE_DRI3_MODIFIERS + if (draw->multiplanes_available) + options |= XCB_PRESENT_OPTION_SUBOPTIMAL; +#endif back->busy = 1; back->last_swap = draw->send_sbc; xcb_present_pixmap(draw->conn, @@ -720,25 +1023,31 @@ loader_dri3_swap_buffers_msc(struct loader_dri3_drawable *draw, remainder, 0, NULL); ret = (int64_t) draw->send_sbc; - /* If there's a fake front, then copy the source back buffer - * to the fake front to keep it up to date. This needs - * to reset the fence and make future users block until - * the X server is done copying the bits + /* Schedule a server-side back-preserving blit if necessary. + * This happens iff all conditions below are satisfied: + * a) We have a fake front, + * b) We need to preserve the back buffer, + * c) We don't have local blit capabilities. */ - if (draw->have_fake_front && !draw->is_different_gpu) { - dri3_fence_reset(draw->conn, draw->buffers[LOADER_DRI3_FRONT_ID]); - dri3_copy_area(draw->conn, - back->pixmap, - draw->buffers[LOADER_DRI3_FRONT_ID]->pixmap, + if (!loader_dri3_have_image_blit(draw) && draw->cur_blit_source != -1 && + draw->cur_blit_source != LOADER_DRI3_BACK_ID(draw->cur_back)) { + struct loader_dri3_buffer *new_back = dri3_back_buffer(draw); + struct loader_dri3_buffer *src = draw->buffers[draw->cur_blit_source]; + + dri3_fence_reset(draw->conn, new_back); + dri3_copy_area(draw->conn, src->pixmap, + new_back->pixmap, dri3_drawable_gc(draw), - 0, 0, 0, 0, - draw->width, draw->height); - dri3_fence_trigger(draw->conn, draw->buffers[LOADER_DRI3_FRONT_ID]); + 0, 0, 0, 0, draw->width, draw->height); + dri3_fence_trigger(draw->conn, new_back); + new_back->last_swap = src->last_swap; } + xcb_flush(draw->conn); if (draw->stamp) ++(*draw->stamp); } + mtx_unlock(&draw->mtx); draw->ext->flush->invalidate(draw->dri_drawable); @@ -748,15 +1057,15 @@ loader_dri3_swap_buffers_msc(struct loader_dri3_drawable *draw, int loader_dri3_query_buffer_age(struct loader_dri3_drawable *draw) { - int back_id = LOADER_DRI3_BACK_ID(dri3_find_back(draw)); + struct loader_dri3_buffer *back = dri3_find_back_alloc(draw); + int ret; - if (back_id < 0 || !draw->buffers[back_id]) - return 0; + mtx_lock(&draw->mtx); + ret = (!back || back->last_swap == 0) ? 0 : + draw->send_sbc - back->last_swap + 1; + mtx_unlock(&draw->mtx); - if (draw->buffers[back_id]->last_swap != 0) - return draw->send_sbc - draw->buffers[back_id]->last_swap + 1; - else - return 0; + return ret; } /** loader_dri3_open @@ -806,14 +1115,115 @@ dri3_cpp_for_format(uint32_t format) { case __DRI_IMAGE_FORMAT_XBGR8888: case __DRI_IMAGE_FORMAT_XRGB2101010: case __DRI_IMAGE_FORMAT_ARGB2101010: + case __DRI_IMAGE_FORMAT_XBGR2101010: + case __DRI_IMAGE_FORMAT_ABGR2101010: case __DRI_IMAGE_FORMAT_SARGB8: + case __DRI_IMAGE_FORMAT_SABGR8: return 4; + case __DRI_IMAGE_FORMAT_XBGR16161616F: + case __DRI_IMAGE_FORMAT_ABGR16161616F: + return 8; case __DRI_IMAGE_FORMAT_NONE: default: return 0; } } +/* Map format of render buffer to corresponding format for the linear_buffer + * used for sharing with the display gpu of a Prime setup (== is_different_gpu). + * Usually linear_format == format, except for depth >= 30 formats, where + * different gpu vendors have different preferences wrt. color channel ordering. + */ +static uint32_t +dri3_linear_format_for_format(struct loader_dri3_drawable *draw, uint32_t format) +{ + switch (format) { + case __DRI_IMAGE_FORMAT_XRGB2101010: + case __DRI_IMAGE_FORMAT_XBGR2101010: + /* Different preferred formats for different hw */ + if (dri3_get_red_mask_for_depth(draw, 30) == 0x3ff) + return __DRI_IMAGE_FORMAT_XBGR2101010; + else + return __DRI_IMAGE_FORMAT_XRGB2101010; + + case __DRI_IMAGE_FORMAT_ARGB2101010: + case __DRI_IMAGE_FORMAT_ABGR2101010: + /* Different preferred formats for different hw */ + if (dri3_get_red_mask_for_depth(draw, 30) == 0x3ff) + return __DRI_IMAGE_FORMAT_ABGR2101010; + else + return __DRI_IMAGE_FORMAT_ARGB2101010; + + default: + return format; + } +} + +/* the DRIimage createImage function takes __DRI_IMAGE_FORMAT codes, while + * the createImageFromFds call takes DRM_FORMAT codes. To avoid + * complete confusion, just deal in __DRI_IMAGE_FORMAT codes for now and + * translate to DRM_FORMAT codes in the call to createImageFromFds + */ +static int +image_format_to_fourcc(int format) +{ + + /* Convert from __DRI_IMAGE_FORMAT to DRM_FORMAT (sigh) */ + switch (format) { + case __DRI_IMAGE_FORMAT_SARGB8: return __DRI_IMAGE_FOURCC_SARGB8888; + case __DRI_IMAGE_FORMAT_SABGR8: return __DRI_IMAGE_FOURCC_SABGR8888; + case __DRI_IMAGE_FORMAT_RGB565: return DRM_FORMAT_RGB565; + case __DRI_IMAGE_FORMAT_XRGB8888: return DRM_FORMAT_XRGB8888; + case __DRI_IMAGE_FORMAT_ARGB8888: return DRM_FORMAT_ARGB8888; + case __DRI_IMAGE_FORMAT_ABGR8888: return DRM_FORMAT_ABGR8888; + case __DRI_IMAGE_FORMAT_XBGR8888: return DRM_FORMAT_XBGR8888; + case __DRI_IMAGE_FORMAT_XRGB2101010: return DRM_FORMAT_XRGB2101010; + case __DRI_IMAGE_FORMAT_ARGB2101010: return DRM_FORMAT_ARGB2101010; + case __DRI_IMAGE_FORMAT_XBGR2101010: return DRM_FORMAT_XBGR2101010; + case __DRI_IMAGE_FORMAT_ABGR2101010: return DRM_FORMAT_ABGR2101010; + case __DRI_IMAGE_FORMAT_XBGR16161616F: return DRM_FORMAT_XBGR16161616F; + case __DRI_IMAGE_FORMAT_ABGR16161616F: return DRM_FORMAT_ABGR16161616F; + } + return 0; +} + +#ifdef HAVE_DRI3_MODIFIERS +static bool +has_supported_modifier(struct loader_dri3_drawable *draw, unsigned int format, + uint64_t *modifiers, uint32_t count) +{ + uint64_t *supported_modifiers; + int32_t supported_modifiers_count; + bool found = false; + int i, j; + + if (!draw->ext->image->queryDmaBufModifiers(draw->dri_screen, + format, 0, NULL, NULL, + &supported_modifiers_count) || + supported_modifiers_count == 0) + return false; + + supported_modifiers = malloc(supported_modifiers_count * sizeof(uint64_t)); + if (!supported_modifiers) + return false; + + draw->ext->image->queryDmaBufModifiers(draw->dri_screen, format, + supported_modifiers_count, + supported_modifiers, NULL, + &supported_modifiers_count); + + for (i = 0; !found && i < supported_modifiers_count; i++) { + for (j = 0; !found && j < count; j++) { + if (supported_modifiers[i] == modifiers[j]) + found = true; + } + } + + free(supported_modifiers); + return found; +} +#endif + /** loader_dri3_alloc_render_buffer * * Use the driver createImage function to construct a __DRIimage, then @@ -830,8 +1240,10 @@ dri3_alloc_render_buffer(struct loader_dri3_drawable *draw, unsigned int format, xcb_pixmap_t pixmap; xcb_sync_fence_t sync_fence; struct xshmfence *shm_fence; - int buffer_fd, fence_fd; - int stride; + int buffer_fds[4], fence_fd; + int num_planes = 0; + int i, mod; + int ret; /* Create an xshmfence object and * prepare to send that to the X server @@ -856,13 +1268,88 @@ dri3_alloc_render_buffer(struct loader_dri3_drawable *draw, unsigned int format, goto no_image; if (!draw->is_different_gpu) { - buffer->image = draw->ext->image->createImage(draw->dri_screen, - width, height, - format, - __DRI_IMAGE_USE_SHARE | - __DRI_IMAGE_USE_SCANOUT | - __DRI_IMAGE_USE_BACKBUFFER, - buffer); +#ifdef HAVE_DRI3_MODIFIERS + if (draw->multiplanes_available && + draw->ext->image->base.version >= 15 && + draw->ext->image->queryDmaBufModifiers && + draw->ext->image->createImageWithModifiers) { + xcb_dri3_get_supported_modifiers_cookie_t mod_cookie; + xcb_dri3_get_supported_modifiers_reply_t *mod_reply; + xcb_generic_error_t *error = NULL; + uint64_t *modifiers = NULL; + uint32_t count = 0; + + mod_cookie = xcb_dri3_get_supported_modifiers(draw->conn, + draw->window, + depth, buffer->cpp * 8); + mod_reply = xcb_dri3_get_supported_modifiers_reply(draw->conn, + mod_cookie, + &error); + if (!mod_reply) + goto no_image; + + if (mod_reply->num_window_modifiers) { + count = mod_reply->num_window_modifiers; + modifiers = malloc(count * sizeof(uint64_t)); + if (!modifiers) { + free(mod_reply); + goto no_image; + } + + memcpy(modifiers, + xcb_dri3_get_supported_modifiers_window_modifiers(mod_reply), + count * sizeof(uint64_t)); + + if (!has_supported_modifier(draw, image_format_to_fourcc(format), + modifiers, count)) { + free(modifiers); + count = 0; + modifiers = NULL; + } + } + + if (mod_reply->num_screen_modifiers && modifiers == NULL) { + count = mod_reply->num_screen_modifiers; + modifiers = malloc(count * sizeof(uint64_t)); + if (!modifiers) { + free(modifiers); + free(mod_reply); + goto no_image; + } + + memcpy(modifiers, + xcb_dri3_get_supported_modifiers_screen_modifiers(mod_reply), + count * sizeof(uint64_t)); + } + + free(mod_reply); + + /* don't use createImageWithModifiers() if we have no + * modifiers, other things depend on the use flags when + * there are no modifiers to know that a buffer can be + * shared. + */ + if (modifiers) { + buffer->image = draw->ext->image->createImageWithModifiers(draw->dri_screen, + width, height, + format, + modifiers, + count, + buffer); + } + + free(modifiers); + } +#endif + if (!buffer->image) + buffer->image = draw->ext->image->createImage(draw->dri_screen, + width, height, + format, + __DRI_IMAGE_USE_SHARE | + __DRI_IMAGE_USE_SCANOUT | + __DRI_IMAGE_USE_BACKBUFFER, + buffer); + pixmap_buffer = buffer->image; if (!buffer->image) @@ -879,7 +1366,8 @@ dri3_alloc_render_buffer(struct loader_dri3_drawable *draw, unsigned int format, buffer->linear_buffer = draw->ext->image->createImage(draw->dri_screen, - width, height, format, + width, height, + dri3_linear_format_for_format(draw, format), __DRI_IMAGE_USE_SHARE | __DRI_IMAGE_USE_LINEAR | __DRI_IMAGE_USE_BACKBUFFER, @@ -890,25 +1378,70 @@ dri3_alloc_render_buffer(struct loader_dri3_drawable *draw, unsigned int format, goto no_linear_buffer; } - /* X wants the stride, so ask the image for it + /* X want some information about the planes, so ask the image for it */ - if (!draw->ext->image->queryImage(pixmap_buffer, __DRI_IMAGE_ATTRIB_STRIDE, - &stride)) - goto no_buffer_attrib; + if (!draw->ext->image->queryImage(pixmap_buffer, __DRI_IMAGE_ATTRIB_NUM_PLANES, + &num_planes)) + num_planes = 1; - buffer->pitch = stride; + for (i = 0; i < num_planes; i++) { + __DRIimage *image = draw->ext->image->fromPlanar(pixmap_buffer, i, NULL); - if (!draw->ext->image->queryImage(pixmap_buffer, __DRI_IMAGE_ATTRIB_FD, - &buffer_fd)) - goto no_buffer_attrib; + if (!image) { + assert(i == 0); + image = pixmap_buffer; + } - xcb_dri3_pixmap_from_buffer(draw->conn, - (pixmap = xcb_generate_id(draw->conn)), - draw->drawable, - buffer->size, - width, height, buffer->pitch, - depth, buffer->cpp * 8, - buffer_fd); + ret = draw->ext->image->queryImage(image, __DRI_IMAGE_ATTRIB_FD, + &buffer_fds[i]); + ret &= draw->ext->image->queryImage(image, __DRI_IMAGE_ATTRIB_STRIDE, + &buffer->strides[i]); + ret &= draw->ext->image->queryImage(image, __DRI_IMAGE_ATTRIB_OFFSET, + &buffer->offsets[i]); + if (image != pixmap_buffer) + draw->ext->image->destroyImage(image); + + if (!ret) + goto no_buffer_attrib; + } + + ret = draw->ext->image->queryImage(pixmap_buffer, + __DRI_IMAGE_ATTRIB_MODIFIER_UPPER, &mod); + buffer->modifier = (uint64_t) mod << 32; + ret &= draw->ext->image->queryImage(pixmap_buffer, + __DRI_IMAGE_ATTRIB_MODIFIER_LOWER, &mod); + buffer->modifier |= (uint64_t)(mod & 0xffffffff); + + if (!ret) + buffer->modifier = DRM_FORMAT_MOD_INVALID; + + pixmap = xcb_generate_id(draw->conn); +#ifdef HAVE_DRI3_MODIFIERS + if (draw->multiplanes_available && + buffer->modifier != DRM_FORMAT_MOD_INVALID) { + xcb_dri3_pixmap_from_buffers(draw->conn, + pixmap, + draw->window, + num_planes, + width, height, + buffer->strides[0], buffer->offsets[0], + buffer->strides[1], buffer->offsets[1], + buffer->strides[2], buffer->offsets[2], + buffer->strides[3], buffer->offsets[3], + depth, buffer->cpp * 8, + buffer->modifier, + buffer_fds); + } else +#endif + { + xcb_dri3_pixmap_from_buffer(draw->conn, + pixmap, + draw->drawable, + buffer->size, + width, height, buffer->strides[0], + depth, buffer->cpp * 8, + buffer_fds[0]); + } xcb_dri3_fence_from_fd(draw->conn, pixmap, @@ -930,6 +1463,9 @@ dri3_alloc_render_buffer(struct loader_dri3_drawable *draw, unsigned int format, return buffer; no_buffer_attrib: + do { + close(buffer_fds[i]); + } while (--i >= 0); draw->ext->image->destroyImage(pixmap_buffer); no_linear_buffer: if (draw->is_different_gpu) @@ -950,9 +1486,9 @@ no_shm_fence: * track the geometry of the drawable */ static int -dri3_update_drawable(__DRIdrawable *driDrawable, - struct loader_dri3_drawable *draw) +dri3_update_drawable(struct loader_dri3_drawable *draw) { + mtx_lock(&draw->mtx); if (draw->first_init) { xcb_get_geometry_cookie_t geom_cookie; xcb_get_geometry_reply_t *geom_reply; @@ -960,6 +1496,7 @@ dri3_update_drawable(__DRIdrawable *driDrawable, xcb_generic_error_t *error; xcb_present_query_capabilities_cookie_t present_capabilities_cookie; xcb_present_query_capabilities_reply_t *present_capabilities_reply; + xcb_window_t root_win; draw->first_init = false; @@ -993,13 +1530,15 @@ dri3_update_drawable(__DRIdrawable *driDrawable, geom_reply = xcb_get_geometry_reply(draw->conn, geom_cookie, NULL); - if (!geom_reply) + if (!geom_reply) { + mtx_unlock(&draw->mtx); return false; - + } draw->width = geom_reply->width; draw->height = geom_reply->height; draw->depth = geom_reply->depth; draw->vtable->set_drawable_size(draw, draw->width, draw->height); + root_win = geom_reply->root; free(geom_reply); @@ -1026,38 +1565,25 @@ dri3_update_drawable(__DRIdrawable *driDrawable, if (error) { if (error->error_code != BadWindow) { free(error); + mtx_unlock(&draw->mtx); return false; } + free(error); draw->is_pixmap = true; xcb_unregister_for_special_event(draw->conn, draw->special_event); draw->special_event = NULL; } + + if (draw->is_pixmap) + draw->window = root_win; + else + draw->window = draw->drawable; } dri3_flush_present_events(draw); + mtx_unlock(&draw->mtx); return true; } -/* the DRIimage createImage function takes __DRI_IMAGE_FORMAT codes, while - * the createImageFromFds call takes __DRI_IMAGE_FOURCC codes. To avoid - * complete confusion, just deal in __DRI_IMAGE_FORMAT codes for now and - * translate to __DRI_IMAGE_FOURCC codes in the call to createImageFromFds - */ -static int -image_format_to_fourcc(int format) -{ - - /* Convert from __DRI_IMAGE_FORMAT to __DRI_IMAGE_FOURCC (sigh) */ - switch (format) { - case __DRI_IMAGE_FORMAT_SARGB8: return __DRI_IMAGE_FOURCC_SARGB8888; - case __DRI_IMAGE_FORMAT_RGB565: return __DRI_IMAGE_FOURCC_RGB565; - case __DRI_IMAGE_FORMAT_XRGB8888: return __DRI_IMAGE_FOURCC_XRGB8888; - case __DRI_IMAGE_FORMAT_ARGB8888: return __DRI_IMAGE_FOURCC_ARGB8888; - case __DRI_IMAGE_FORMAT_ABGR8888: return __DRI_IMAGE_FOURCC_ABGR8888; - case __DRI_IMAGE_FORMAT_XBGR8888: return __DRI_IMAGE_FOURCC_XBGR8888; - } - return 0; -} - __DRIimage * loader_dri3_create_image(xcb_connection_t *c, xcb_dri3_buffer_from_pixmap_reply_t *bp_reply, @@ -1094,11 +1620,58 @@ loader_dri3_create_image(xcb_connection_t *c, ret = image->fromPlanar(image_planar, 0, loaderPrivate); - image->destroyImage(image_planar); + if (!ret) + ret = image_planar; + else + image->destroyImage(image_planar); return ret; } +#ifdef HAVE_DRI3_MODIFIERS +__DRIimage * +loader_dri3_create_image_from_buffers(xcb_connection_t *c, + xcb_dri3_buffers_from_pixmap_reply_t *bp_reply, + unsigned int format, + __DRIscreen *dri_screen, + const __DRIimageExtension *image, + void *loaderPrivate) +{ + __DRIimage *ret; + int *fds; + uint32_t *strides_in, *offsets_in; + int strides[4], offsets[4]; + unsigned error; + int i; + + if (bp_reply->nfd > 4) + return NULL; + + fds = xcb_dri3_buffers_from_pixmap_reply_fds(c, bp_reply); + strides_in = xcb_dri3_buffers_from_pixmap_strides(bp_reply); + offsets_in = xcb_dri3_buffers_from_pixmap_offsets(bp_reply); + for (i = 0; i < bp_reply->nfd; i++) { + strides[i] = strides_in[i]; + offsets[i] = offsets_in[i]; + } + + ret = image->createImageFromDmaBufs2(dri_screen, + bp_reply->width, + bp_reply->height, + image_format_to_fourcc(format), + bp_reply->modifier, + fds, bp_reply->nfd, + strides, offsets, + 0, 0, 0, 0, /* UNDEFINED */ + &error, loaderPrivate); + + for (i = 0; i < bp_reply->nfd; i++) + close(fds[i]); + + return ret; +} +#endif + /** dri3_get_pixmap_buffer * * Get the DRM object for a pixmap from the X server and @@ -1112,10 +1685,10 @@ dri3_get_pixmap_buffer(__DRIdrawable *driDrawable, unsigned int format, int buf_id = loader_dri3_pixmap_buf_id(buffer_type); struct loader_dri3_buffer *buffer = draw->buffers[buf_id]; xcb_drawable_t pixmap; - xcb_dri3_buffer_from_pixmap_cookie_t bp_cookie; - xcb_dri3_buffer_from_pixmap_reply_t *bp_reply; xcb_sync_fence_t sync_fence; struct xshmfence *shm_fence; + int width; + int height; int fence_fd; __DRIscreen *cur_screen; @@ -1137,48 +1710,73 @@ dri3_get_pixmap_buffer(__DRIdrawable *driDrawable, unsigned int format, goto no_fence; } - xcb_dri3_fence_from_fd(draw->conn, - pixmap, - (sync_fence = xcb_generate_id(draw->conn)), - false, - fence_fd); - - bp_cookie = xcb_dri3_buffer_from_pixmap(draw->conn, pixmap); - bp_reply = xcb_dri3_buffer_from_pixmap_reply(draw->conn, bp_cookie, NULL); - if (!bp_reply) - goto no_image; - /* Get the currently-bound screen or revert to using the drawable's screen if * no contexts are currently bound. The latter case is at least necessary for * obs-studio, when using Window Capture (Xcomposite) as a Source. */ - cur_screen = draw->vtable->get_dri_screen(draw); + cur_screen = draw->vtable->get_dri_screen(); if (!cur_screen) { cur_screen = draw->dri_screen; } - buffer->image = loader_dri3_create_image(draw->conn, bp_reply, format, - cur_screen, draw->ext->image, - buffer); + xcb_dri3_fence_from_fd(draw->conn, + pixmap, + (sync_fence = xcb_generate_id(draw->conn)), + false, + fence_fd); +#ifdef HAVE_DRI3_MODIFIERS + if (draw->multiplanes_available && + draw->ext->image->base.version >= 15 && + draw->ext->image->createImageFromDmaBufs2) { + xcb_dri3_buffers_from_pixmap_cookie_t bps_cookie; + xcb_dri3_buffers_from_pixmap_reply_t *bps_reply; + + bps_cookie = xcb_dri3_buffers_from_pixmap(draw->conn, pixmap); + bps_reply = xcb_dri3_buffers_from_pixmap_reply(draw->conn, bps_cookie, + NULL); + if (!bps_reply) + goto no_image; + buffer->image = + loader_dri3_create_image_from_buffers(draw->conn, bps_reply, format, + cur_screen, draw->ext->image, + buffer); + width = bps_reply->width; + height = bps_reply->height; + free(bps_reply); + } else +#endif + { + xcb_dri3_buffer_from_pixmap_cookie_t bp_cookie; + xcb_dri3_buffer_from_pixmap_reply_t *bp_reply; + + bp_cookie = xcb_dri3_buffer_from_pixmap(draw->conn, pixmap); + bp_reply = xcb_dri3_buffer_from_pixmap_reply(draw->conn, bp_cookie, NULL); + if (!bp_reply) + goto no_image; + + buffer->image = loader_dri3_create_image(draw->conn, bp_reply, format, + cur_screen, draw->ext->image, + buffer); + width = bp_reply->width; + height = bp_reply->height; + free(bp_reply); + } + if (!buffer->image) goto no_image; buffer->pixmap = pixmap; buffer->own_pixmap = false; - buffer->width = bp_reply->width; - buffer->height = bp_reply->height; - buffer->buffer_type = buffer_type; + buffer->width = width; + buffer->height = height; buffer->shm_fence = shm_fence; buffer->sync_fence = sync_fence; draw->buffers[buf_id] = buffer; - free(bp_reply); - return buffer; no_image: - free(bp_reply); xcb_sync_destroy_fence(draw->conn, sync_fence); xshmfence_unmap_shm(shm_fence); no_fence: @@ -1198,12 +1796,12 @@ dri3_get_buffer(__DRIdrawable *driDrawable, struct loader_dri3_drawable *draw) { struct loader_dri3_buffer *buffer; + bool fence_await = buffer_type == loader_dri3_buffer_back; int buf_id; - __DRIcontext *dri_context; - - dri_context = draw->vtable->get_dri_context(draw); if (buffer_type == loader_dri3_buffer_back) { + draw->back_format = format; + buf_id = dri3_find_back(draw); if (buf_id < 0) @@ -1214,11 +1812,12 @@ dri3_get_buffer(__DRIdrawable *driDrawable, buffer = draw->buffers[buf_id]; - /* Allocate a new buffer if there isn't an old one, or if that - * old one is the wrong size + /* Allocate a new buffer if there isn't an old one, if that + * old one is the wrong size, or if it's suboptimal */ if (!buffer || buffer->width != draw->width || - buffer->height != draw->height) { + buffer->height != draw->height || + buffer->reallocate) { struct loader_dri3_buffer *new_buffer; /* Allocate the new buffers @@ -1234,30 +1833,31 @@ dri3_get_buffer(__DRIdrawable *driDrawable, /* When resizing, copy the contents of the old buffer, waiting for that * copy to complete using our fences before proceeding */ - switch (buffer_type) { - case loader_dri3_buffer_back: - if (buffer) { - if (!buffer->linear_buffer) { - dri3_fence_reset(draw->conn, new_buffer); - dri3_fence_await(draw->conn, buffer); - dri3_copy_area(draw->conn, - buffer->pixmap, - new_buffer->pixmap, - dri3_drawable_gc(draw), - 0, 0, 0, 0, - draw->width, draw->height); - dri3_fence_trigger(draw->conn, new_buffer); - } else if (draw->vtable->in_current_context(draw)) { - draw->ext->image->blitImage(dri_context, - new_buffer->image, - buffer->image, - 0, 0, draw->width, draw->height, - 0, 0, draw->width, draw->height, 0); - } - dri3_free_render_buffer(draw, buffer); + if ((buffer_type == loader_dri3_buffer_back || + (buffer_type == loader_dri3_buffer_front && draw->have_fake_front)) + && buffer) { + + /* Fill the new buffer with data from an old buffer */ + if (!loader_dri3_blit_image(draw, + new_buffer->image, + buffer->image, + 0, 0, draw->width, draw->height, + 0, 0, 0) && + !buffer->linear_buffer) { + dri3_fence_reset(draw->conn, new_buffer); + dri3_copy_area(draw->conn, + buffer->pixmap, + new_buffer->pixmap, + dri3_drawable_gc(draw), + 0, 0, 0, 0, + draw->width, draw->height); + dri3_fence_trigger(draw->conn, new_buffer); + fence_await = true; } - break; - case loader_dri3_buffer_front: + dri3_free_render_buffer(draw, buffer); + } else if (buffer_type == loader_dri3_buffer_front) { + /* Fill the new fake front with data from a real front */ + loader_dri3_swapbuffer_barrier(draw); dri3_fence_reset(draw->conn, new_buffer); dri3_copy_area(draw->conn, draw->drawable, @@ -1267,23 +1867,48 @@ dri3_get_buffer(__DRIdrawable *driDrawable, draw->width, draw->height); dri3_fence_trigger(draw->conn, new_buffer); - if (new_buffer->linear_buffer && - draw->vtable->in_current_context(draw)) { - dri3_fence_await(draw->conn, new_buffer); - draw->ext->image->blitImage(dri_context, - new_buffer->image, - new_buffer->linear_buffer, - 0, 0, draw->width, draw->height, - 0, 0, draw->width, draw->height, 0); - } - break; + if (new_buffer->linear_buffer) { + dri3_fence_await(draw->conn, draw, new_buffer); + (void) loader_dri3_blit_image(draw, + new_buffer->image, + new_buffer->linear_buffer, + 0, 0, draw->width, draw->height, + 0, 0, 0); + } else + fence_await = true; } buffer = new_buffer; - buffer->buffer_type = buffer_type; draw->buffers[buf_id] = buffer; } - dri3_fence_await(draw->conn, buffer); + if (fence_await) + dri3_fence_await(draw->conn, draw, buffer); + + /* + * Do we need to preserve the content of a previous buffer? + * + * Note that this blit is needed only to avoid a wait for a buffer that + * is currently in the flip chain or being scanned out from. That's really + * a tradeoff. If we're ok with the wait we can reduce the number of back + * buffers to 1 for SWAP_EXCHANGE, and 1 for SWAP_COPY, + * but in the latter case we must disallow page-flipping. + */ + if (buffer_type == loader_dri3_buffer_back && + draw->cur_blit_source != -1 && + draw->buffers[draw->cur_blit_source] && + buffer != draw->buffers[draw->cur_blit_source]) { + + struct loader_dri3_buffer *source = draw->buffers[draw->cur_blit_source]; + + /* Avoid flushing here. Will propably do good for tiling hardware. */ + (void) loader_dri3_blit_image(draw, + buffer->image, + source->image, + 0, 0, draw->width, draw->height, + 0, 0, 0); + buffer->last_swap = source->last_swap; + draw->cur_blit_source = -1; + } /* Return the requested buffer */ return buffer; } @@ -1307,10 +1932,12 @@ dri3_free_buffers(__DRIdrawable *driDrawable, case loader_dri3_buffer_back: first_id = LOADER_DRI3_BACK_ID(0); n_id = LOADER_DRI3_MAX_BACK; + draw->cur_blit_source = -1; break; case loader_dri3_buffer_front: first_id = LOADER_DRI3_FRONT_ID; - n_id = 1; + /* Don't free a fake front holding new backbuffer content. */ + n_id = (draw->cur_blit_source == LOADER_DRI3_FRONT_ID) ? 0 : 1; } for (buf_id = first_id; buf_id < first_id + n_id; buf_id++) { @@ -1338,6 +1965,7 @@ loader_dri3_get_buffers(__DRIdrawable *driDrawable, { struct loader_dri3_drawable *draw = loaderPrivate; struct loader_dri3_buffer *front, *back; + int buf_id; buffers->image_mask = 0; buffers->front = NULL; @@ -1346,11 +1974,23 @@ loader_dri3_get_buffers(__DRIdrawable *driDrawable, front = NULL; back = NULL; - if (!dri3_update_drawable(driDrawable, draw)) + if (!dri3_update_drawable(draw)) return false; - /* pixmaps always have front buffers */ - if (draw->is_pixmap) + dri3_update_num_back(draw); + + /* Free no longer needed back buffers */ + for (buf_id = draw->num_back; buf_id < LOADER_DRI3_MAX_BACK; buf_id++) { + if (draw->cur_blit_source != buf_id && draw->buffers[buf_id]) { + dri3_free_render_buffer(draw, draw->buffers[buf_id]); + draw->buffers[buf_id] = NULL; + } + } + + /* pixmaps always have front buffers. + * Exchange swaps also mandate fake front buffers. + */ + if (draw->is_pixmap || draw->swap_method == __DRI_ATTRIB_SWAP_EXCHANGE) buffer_mask |= __DRI_IMAGE_BUFFER_FRONT; if (buffer_mask & __DRI_IMAGE_BUFFER_FRONT) { @@ -1427,7 +2067,93 @@ loader_dri3_update_drawable_geometry(struct loader_dri3_drawable *draw) draw->width = geom_reply->width; draw->height = geom_reply->height; draw->vtable->set_drawable_size(draw, draw->width, draw->height); + draw->ext->flush->invalidate(draw->dri_drawable); free(geom_reply); } } + + +/** + * Make sure the server has flushed all pending swap buffers to hardware + * for this drawable. Ideally we'd want to send an X protocol request to + * have the server block our connection until the swaps are complete. That + * would avoid the potential round-trip here. + */ +void +loader_dri3_swapbuffer_barrier(struct loader_dri3_drawable *draw) +{ + int64_t ust, msc, sbc; + + (void) loader_dri3_wait_for_sbc(draw, 0, &ust, &msc, &sbc); +} + +/** + * Perform any cleanup associated with a close screen operation. + * \param dri_screen[in,out] Pointer to __DRIscreen about to be closed. + * + * This function destroys the screen's cached swap context if any. + */ +void +loader_dri3_close_screen(__DRIscreen *dri_screen) +{ + mtx_lock(&blit_context.mtx); + if (blit_context.ctx && blit_context.cur_screen == dri_screen) { + blit_context.core->destroyContext(blit_context.ctx); + blit_context.ctx = NULL; + } + mtx_unlock(&blit_context.mtx); +} + +/** + * Find a backbuffer slot - potentially allocating a back buffer + * + * \param draw[in,out] Pointer to the drawable for which to find back. + * \return Pointer to a new back buffer or NULL if allocation failed or was + * not mandated. + * + * Find a potentially new back buffer, and if it's not been allocated yet and + * in addition needs initializing, then try to allocate and initialize it. + */ +#include +static struct loader_dri3_buffer * +dri3_find_back_alloc(struct loader_dri3_drawable *draw) +{ + struct loader_dri3_buffer *back; + int id; + + id = dri3_find_back(draw); + if (id < 0) + return NULL; + + back = draw->buffers[id]; + /* Allocate a new back if we haven't got one */ + if (!back && draw->back_format != __DRI_IMAGE_FORMAT_NONE && + dri3_update_drawable(draw)) + back = dri3_alloc_render_buffer(draw, draw->back_format, + draw->width, draw->height, draw->depth); + + if (!back) + return NULL; + + draw->buffers[id] = back; + + /* If necessary, prefill the back with data according to swap_method mode. */ + if (draw->cur_blit_source != -1 && + draw->buffers[draw->cur_blit_source] && + back != draw->buffers[draw->cur_blit_source]) { + struct loader_dri3_buffer *source = draw->buffers[draw->cur_blit_source]; + + dri3_fence_await(draw->conn, draw, source); + dri3_fence_await(draw->conn, draw, back); + (void) loader_dri3_blit_image(draw, + back->image, + source->image, + 0, 0, draw->width, draw->height, + 0, 0, 0); + back->last_swap = source->last_swap; + draw->cur_blit_source = -1; + } + + return back; +}