[PATCH 14/19] present: Add window flip mode
Roman Gilg
subdiff at gmail.com
Mon Jan 29 13:34:12 UTC 2018
In contrast to screen flip mode this mode currently:
* supports flips per windows (these windows need to have the same size
as their parent windows with the same pixmap),
* always copies back to the original pixmap instead of pure flips, while
giving the driver the flip pixmap provided by the application,
* sends pixmap idle signals to the client only after the driver has given
and additional event notify.
This patch only introduces the new mode as a stub. It additionally needs a
driver hook, such that it can get initialized and appropriate cleanup
functions.
Signed-off-by: Roman Gilg <subdiff at gmail.com>
---
present/Makefile.am | 3 +-
present/meson.build | 1 +
present/present.h | 6 +
present/present_priv.h | 9 +
present/present_wnmd.c | 672 +++++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 690 insertions(+), 1 deletion(-)
create mode 100644 present/present_wnmd.c
diff --git a/present/Makefile.am b/present/Makefile.am
index 55ad295..542f4ca 100644
--- a/present/Makefile.am
+++ b/present/Makefile.am
@@ -15,6 +15,7 @@ libpresent_la_SOURCES = \
present_request.c \
present_scmd.c \
present_screen.c \
- present_vblank.c
+ present_vblank.c \
+ present_wnmd.c
sdk_HEADERS = present.h presentext.h
diff --git a/present/meson.build b/present/meson.build
index 5e1dd3c..ad4fcff 100644
--- a/present/meson.build
+++ b/present/meson.build
@@ -9,6 +9,7 @@ srcs_present = [
'present_scmd.c',
'present_screen.c',
'present_vblank.c',
+ 'present_wnmd.c',
]
libxserver_present = static_library('libxserver_present',
diff --git a/present/present.h b/present/present.h
index fcf7675..7929cf9 100644
--- a/present/present.h
+++ b/present/present.h
@@ -149,6 +149,12 @@ typedef struct present_wnmd_info {
*/
extern _X_EXPORT void
present_event_notify(uint64_t event_id, uint64_t ust, uint64_t msc);
+/*
+ * Called when 'event_id' occurs for 'window'.
+ * 'ust' and 'msc' indicate when the event actually happened
+ */
+extern _X_EXPORT void
+present_wnmd_event_notify(WindowPtr window, uint64_t event_id, uint64_t ust, uint64_t msc);
/* 'crtc' has been turned off, so any pending events will never occur.
*/
diff --git a/present/present_priv.h b/present/present_priv.h
index 9656380..a542b62 100644
--- a/present/present_priv.h
+++ b/present/present_priv.h
@@ -467,4 +467,13 @@ present_vblank_scrap(present_vblank_ptr vblank);
void
present_vblank_destroy(present_vblank_ptr vblank);
+/*
+ * present_wnmd.c
+ */
+void
+present_wnmd_set_abort_flip(WindowPtr window);
+
+void
+present_wnmd_init_mode_hooks(present_screen_priv_ptr screen_priv);
+
#endif /* _PRESENT_PRIV_H_ */
diff --git a/present/present_wnmd.c b/present/present_wnmd.c
new file mode 100644
index 0000000..c428232
--- /dev/null
+++ b/present/present_wnmd.c
@@ -0,0 +1,672 @@
+/*
+ * Copyright © 2018 Roman Gilg
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission. The copyright holders make no representations
+ * about the suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "present_priv.h"
+
+/*
+ * Window flip mode
+ *
+ * Provides per-window flips. Flips can be processed on windows that
+ * have the same size as their parents, which they share their pixmap with.
+ *
+ * A flip still requires a copy currently, since the original pixmap needs
+ * to be updated with the new pixmap content. Just a flip of all windows
+ * to the new pixmap is diffcult, because the original pixmap might not be
+ * controlled by the Xserver.
+ *
+ */
+
+static void
+present_wnmd_execute(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_msc);
+
+static void
+present_wnmd_create_event_id(present_window_priv_ptr window_priv, present_vblank_ptr vblank)
+{
+ vblank->event_id = ++window_priv->event_id;
+}
+
+static uint32_t
+present_wnmd_query_capabilities(present_screen_priv_ptr screen_priv)
+{
+ return screen_priv->wnmd_info->capabilities;
+}
+
+static RRCrtcPtr
+present_wnmd_get_crtc(present_screen_priv_ptr screen_priv, WindowPtr window)
+{
+ return (*screen_priv->wnmd_info->get_crtc)(window);
+}
+
+static int
+present_wnmd_get_ust_msc(ScreenPtr screen, WindowPtr window, uint64_t *ust, uint64_t *msc)
+{
+ present_screen_priv_ptr screen_priv = present_screen_priv(screen);
+ return (*screen_priv->wnmd_info->get_ust_msc)(window, ust, msc);
+}
+
+/*
+ * When the wait fence or previous flip is completed, it's time
+ * to re-try the request
+ */
+static void
+present_wnmd_re_execute(present_vblank_ptr vblank)
+{
+ uint64_t ust = 0, crtc_msc = 0;
+
+ (void) present_wnmd_get_ust_msc(vblank->screen, vblank->window, &ust, &crtc_msc);
+ present_wnmd_execute(vblank, ust, crtc_msc);
+}
+
+static void
+present_wnmd_flip_try_ready(WindowPtr window)
+{
+ present_window_priv_ptr window_priv = present_window_priv(window);
+ present_vblank_ptr vblank;
+
+ xorg_list_for_each_entry(vblank, &window_priv->flip_queue, event_queue) {
+ if (vblank->queued) {
+ present_wnmd_re_execute(vblank);
+ return;
+ }
+ }
+}
+
+static void
+present_wnmd_free_idle_vblank(present_vblank_ptr vblank)
+{
+ present_pixmap_idle(vblank->pixmap, vblank->window, vblank->serial, vblank->idle_fence);
+ present_vblank_destroy(vblank);
+}
+
+/*
+ * Free any left over idle vblanks
+ */
+static void
+present_wnmd_free_idle_vblanks(WindowPtr window)
+{
+ present_window_priv_ptr window_priv = present_window_priv(window);
+ present_vblank_ptr vblank, tmp;
+
+ xorg_list_for_each_entry_safe(vblank, tmp, &window_priv->idle_queue, event_queue) {
+ present_wnmd_free_idle_vblank(vblank);
+ }
+
+ if (window_priv->flip_active) {
+ present_wnmd_free_idle_vblank(window_priv->flip_active);
+ window_priv->flip_active = NULL;
+ }
+}
+
+static WindowPtr
+present_wnmd_toplvl_pixmap_window(WindowPtr window)
+{
+ ScreenPtr screen = window->drawable.pScreen;
+ PixmapPtr pixmap = (*screen->GetWindowPixmap)(window);
+ WindowPtr w = window;
+ WindowPtr next_w;
+
+ while(w->parent) {
+ next_w = w->parent;
+ if ( (*screen->GetWindowPixmap)(next_w) != pixmap) {
+ break;
+ }
+ w = next_w;
+ }
+ return w;
+}
+
+void
+present_wnmd_set_abort_flip(WindowPtr window)
+{
+ present_window_priv_ptr window_priv = present_window_priv(window);
+
+ if (!window_priv->flip_pending->abort_flip) {
+ window_priv->flip_pending->abort_flip = TRUE;
+ }
+}
+
+static void
+present_wnmd_unflip(WindowPtr window)
+{
+ present_window_priv_ptr window_priv = present_window_priv(window);
+ present_screen_priv_ptr screen_priv = present_screen_priv(window->drawable.pScreen);
+
+ assert (!window_priv->unflip_event_id);
+ assert (!window_priv->flip_pending);
+
+ window_priv->unflip_event_id = ++window_priv->event_id;
+ DebugPresent(("u %lld\n", window_priv->unflip_event_id));
+ (*screen_priv->wnmd_info->unflip) (window, window_priv->unflip_event_id);
+}
+
+static void
+present_wnmd_flip_notify(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_msc)
+{
+ WindowPtr window = vblank->window;
+ present_window_priv_ptr window_priv = present_window_priv(window);
+
+ DebugPresent(("\tn %lld %p %8lld: %08lx -> %08lx\n",
+ vblank->event_id, vblank, vblank->target_msc,
+ vblank->pixmap ? vblank->pixmap->drawable.id : 0,
+ vblank->window ? vblank->window->drawable.id : 0));
+
+ assert (vblank == window_priv->flip_pending);
+
+ xorg_list_del(&vblank->event_queue);
+
+ if (window_priv->flip_active) {
+ if (window_priv->flip_active->flip_idler)
+ present_wnmd_free_idle_vblank(window_priv->flip_active);
+ else
+ /* Put the previous flip in the idle_queue and wait for further notice from DDX */
+ xorg_list_append(&window_priv->flip_active->event_queue, &window_priv->idle_queue);
+ }
+
+ window_priv->flip_active = vblank;
+ window_priv->flip_pending = NULL;
+
+ if (vblank->abort_flip)
+ present_wnmd_unflip(window);
+
+ present_vblank_notify(vblank, PresentCompleteKindPixmap, PresentCompleteModeFlip, ust, crtc_msc);
+ present_wnmd_flip_try_ready(window);
+}
+
+void
+present_wnmd_event_notify(WindowPtr window, uint64_t event_id, uint64_t ust, uint64_t msc)
+{
+ present_window_priv_ptr window_priv = present_window_priv(window);
+ present_vblank_ptr vblank;
+
+ if (!window_priv)
+ return;
+ if (!event_id)
+ return;
+
+ if (window_priv->flip_active && window_priv->flip_active->event_id == event_id) {
+ /* Notify for active flip, means it is allowed to become idle */
+ window_priv->flip_active->flip_idler = TRUE;
+ return;
+ }
+
+ DebugPresent(("\te %lld ust %lld msc %lld\n", event_id, ust, msc));
+ xorg_list_for_each_entry(vblank, &window_priv->exec_queue, event_queue) {
+ if (event_id == vblank->event_id) {
+ present_wnmd_execute(vblank, ust, msc);
+ return;
+ }
+ }
+ xorg_list_for_each_entry(vblank, &window_priv->flip_queue, event_queue) {
+ if (vblank->event_id == event_id) {
+ if (vblank->queued) {
+ present_wnmd_execute(vblank, ust, msc);
+ } else {
+ assert(vblank->window);
+ present_wnmd_flip_notify(vblank, ust, msc);
+ }
+ return;
+ }
+ }
+
+ xorg_list_for_each_entry(vblank, &window_priv->idle_queue, event_queue) {
+ if (vblank->event_id == event_id) {
+ present_wnmd_free_idle_vblank(vblank);
+ return;
+ }
+ }
+
+ if (event_id == window_priv->unflip_event_id) {
+ DebugPresent(("\tun %lld\n", event_id));
+ window_priv->unflip_event_id = 0;
+ present_wnmd_free_idle_vblanks(window_priv->window);
+ present_wnmd_flip_try_ready(window_priv->window);
+ }
+}
+
+static Bool
+present_wnmd_check_flip(RRCrtcPtr crtc,
+ WindowPtr window,
+ PixmapPtr pixmap,
+ Bool sync_flip,
+ RegionPtr valid,
+ int16_t x_off,
+ int16_t y_off)
+{
+ ScreenPtr screen = window->drawable.pScreen;
+ present_screen_priv_ptr screen_priv = present_screen_priv(screen);
+ WindowPtr toplvl_window = present_wnmd_toplvl_pixmap_window(window);
+
+ if (!screen_priv)
+ return FALSE;
+
+ if (!screen_priv->wnmd_info)
+ return FALSE;
+
+ if (!crtc)
+ return FALSE;
+
+ /* Check to see if the driver supports flips at all */
+ if (!screen_priv->wnmd_info->flip)
+ return FALSE;
+
+ /* Don't flip redirected windows */
+ if (window->redirectDraw != RedirectDrawNone)
+ return FALSE;
+
+ /* Source pixmap must align with window exactly */
+ if (x_off || y_off)
+ return FALSE;
+
+ // TODO: Check for valid region?
+
+ /* Flip pixmap must have same dimensions as window */
+ if (window->drawable.width != pixmap->drawable.width ||
+ window->drawable.height != pixmap->drawable.height)
+ return FALSE;
+
+ /* Window must be same region as toplevel window */
+ if ( !RegionEqual(&window->winSize, &toplvl_window->winSize) )
+ return FALSE;
+
+ /* Ask the driver for permission */
+ if (screen_priv->wnmd_info->check_flip) {
+ if (!(*screen_priv->wnmd_info->check_flip) (crtc, window, pixmap, sync_flip)) {
+ DebugPresent(("\td %08lx -> %08lx\n", window->drawable.id, pixmap ? pixmap->drawable.id : 0));
+ return FALSE;
+ }
+ }
+
+ return TRUE;
+}
+
+/*
+ * 'window' is being reconfigured. Check to see if it is involved
+ * in flipping and clean up as necessary.
+ */
+static void
+present_wnmd_check_flip_window (WindowPtr window)
+{
+ present_window_priv_ptr window_priv = present_window_priv(window);
+ present_vblank_ptr flip_pending;
+ present_vblank_ptr flip_active;
+ present_vblank_ptr vblank;
+
+ /* If this window hasn't ever been used with Present, it can't be
+ * flipping
+ */
+ if (!window_priv)
+ return;
+
+ if (window_priv->unflip_event_id)
+ return;
+
+ flip_pending = window_priv->flip_pending;
+ flip_active = window_priv->flip_active;
+
+ if (flip_pending) {
+ if (!present_wnmd_check_flip(flip_pending->crtc, flip_pending->window, flip_pending->pixmap,
+ flip_pending->sync_flip, NULL, 0, 0))
+ present_wnmd_set_abort_flip(window);
+ } else if (flip_active) {
+ if (!present_wnmd_check_flip(flip_active->crtc, flip_active->window, flip_active->pixmap, flip_active->sync_flip, NULL, 0, 0))
+ present_wnmd_unflip(window);
+ }
+
+ /* Now check any queued vblanks */
+ xorg_list_for_each_entry(vblank, &window_priv->vblank, window_list) {
+ if (vblank->queued && vblank->flip && !present_wnmd_check_flip(vblank->crtc, window, vblank->pixmap, vblank->sync_flip, NULL, 0, 0)) {
+ vblank->flip = FALSE;
+ if (vblank->sync_flip)
+ vblank->requeue = TRUE;
+ }
+ }
+}
+
+static Bool
+present_wnmd_flip(WindowPtr window,
+ RRCrtcPtr crtc,
+ uint64_t event_id,
+ uint64_t target_msc,
+ PixmapPtr pixmap,
+ Bool sync_flip)
+{
+ ScreenPtr screen = crtc->pScreen;
+ present_screen_priv_ptr screen_priv = present_screen_priv(screen);
+
+ return (*screen_priv->wnmd_info->flip) (window,
+ crtc,
+ event_id,
+ target_msc,
+ pixmap,
+ sync_flip);
+}
+
+static void
+present_wnmd_cancel_flip(WindowPtr window)
+{
+ present_window_priv_ptr window_priv = present_window_priv(window);
+
+ if (window_priv->flip_pending)
+ present_wnmd_set_abort_flip(window);
+ else if (!window_priv->unflip_event_id && window_priv->flip_active)
+ present_wnmd_unflip(window);
+}
+
+/*
+ * Once the required MSC has been reached, execute the pending request.
+ *
+ * For requests to actually present something, either blt contents to
+ * the window pixmap or queue a window buffer swap on the backend.
+ *
+ * For requests to just get the current MSC/UST combo, skip that part and
+ * go straight to event delivery.
+ */
+static void
+present_wnmd_execute(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_msc)
+{
+ WindowPtr window = vblank->window;
+ present_window_priv_ptr window_priv = present_window_priv(window);
+
+ if (present_execute_wait(vblank, crtc_msc))
+ return;
+
+ if (vblank->flip && vblank->pixmap && vblank->window) {
+ if (window_priv->flip_pending || window_priv->unflip_event_id) {
+ DebugPresent(("\tr %lld %p (pending %p unflip %lld)\n",
+ vblank->event_id, vblank,
+ window_priv->flip_pending, window_priv->unflip_event_id));
+ xorg_list_del(&vblank->event_queue);
+ xorg_list_append(&vblank->event_queue, &window_priv->flip_queue);
+ vblank->flip_ready = TRUE;
+ return;
+ }
+ }
+
+ xorg_list_del(&vblank->event_queue);
+ xorg_list_del(&vblank->window_list);
+ vblank->queued = FALSE;
+
+ if (vblank->pixmap && vblank->window) {
+
+ if (vblank->flip) {
+ RegionPtr damage;
+
+ DebugPresent(("\tf %lld %p %8lld: %08lx -> %08lx\n",
+ vblank->event_id, vblank, crtc_msc,
+ vblank->pixmap->drawable.id, vblank->window->drawable.id));
+
+ /* Prepare to flip by placing it in the flip queue
+ */
+ xorg_list_add(&vblank->event_queue, &window_priv->flip_queue);
+
+ /* Try to flip - the vblank is now pending
+ */
+ window_priv->flip_pending = vblank;
+ // ask the driver
+ if (present_wnmd_flip(vblank->window, vblank->crtc, vblank->event_id,
+ vblank->target_msc, vblank->pixmap, vblank->sync_flip)) {
+
+ /* Fix window pixmap: Copy pixmap content to window drawable */
+ present_copy_region(&window->drawable,
+ vblank->pixmap,
+ vblank->update,
+ vblank->x_off,
+ vblank->y_off);
+
+ /* Report update region as damaged
+ */
+ if (vblank->update) {
+ damage = vblank->update;
+ RegionIntersect(damage, damage, &window->clipList);
+ } else
+ damage = &window->clipList;
+
+ DamageDamageRegion(&vblank->window->drawable, damage);
+ return;
+ }
+
+ xorg_list_del(&vblank->event_queue);
+ /* Flip failed. Clear the flip_pending field
+ */
+ window_priv->flip_pending = NULL;
+ vblank->flip = FALSE;
+ }
+ DebugPresent(("\tc %p %8lld: %08lx -> %08lx\n", vblank, crtc_msc, vblank->pixmap->drawable.id, vblank->window->drawable.id));
+
+ present_wnmd_cancel_flip(window);
+
+ present_execute_copy(vblank, crtc_msc);
+
+ if (vblank->queued) {
+ xorg_list_add(&vblank->event_queue, &window_priv->exec_queue);
+ xorg_list_append(&vblank->window_list, &window_priv->vblank);
+
+ return;
+ }
+ }
+
+ present_execute_post(vblank, ust, crtc_msc);
+}
+
+static int
+present_wnmd_queue_vblank(ScreenPtr screen,
+ WindowPtr window,
+ RRCrtcPtr crtc,
+ uint64_t event_id,
+ uint64_t msc)
+{
+ present_screen_priv_ptr screen_priv = present_screen_priv(screen);
+ return (*screen_priv->wnmd_info->queue_vblank) (window, crtc, event_id, msc);
+}
+
+static uint64_t
+present_wnmd_window_to_crtc_msc(WindowPtr window, RRCrtcPtr crtc, uint64_t window_msc, uint64_t new_msc)
+{
+ present_window_priv_ptr window_priv = present_get_window_priv(window, TRUE);
+
+ if (crtc != window_priv->crtc) {
+ uint64_t old_ust, old_msc;
+
+ if (window_priv->crtc == PresentCrtcNeverSet) {
+ window_priv->msc_offset = 0;
+ } else {
+ /* The old CRTC may have been turned off, in which case
+ * we'll just use whatever previous MSC we'd seen from this CRTC
+ */
+
+ if (present_wnmd_get_ust_msc(window->drawable.pScreen, window, &old_ust, &old_msc) != Success)
+ old_msc = window_priv->msc;
+
+ window_priv->msc_offset += new_msc - old_msc;
+ }
+ window_priv->crtc = crtc;
+ }
+
+ return window_msc + window_priv->msc_offset;
+}
+
+static int
+present_wnmd_pixmap(WindowPtr window,
+ PixmapPtr pixmap,
+ CARD32 serial,
+ RegionPtr valid,
+ RegionPtr update,
+ int16_t x_off,
+ int16_t y_off,
+ RRCrtcPtr target_crtc,
+ SyncFence *wait_fence,
+ SyncFence *idle_fence,
+ uint32_t options,
+ uint64_t window_msc,
+ uint64_t divisor,
+ uint64_t remainder,
+ present_notify_ptr notifies,
+ int num_notifies)
+{
+ uint64_t ust = 0;
+ uint64_t target_msc;
+ uint64_t crtc_msc = 0;
+ int ret;
+ present_vblank_ptr vblank, tmp;
+ ScreenPtr screen = window->drawable.pScreen;
+ present_window_priv_ptr window_priv = present_get_window_priv(window, TRUE);
+ present_screen_priv_ptr screen_priv = present_screen_priv(screen);
+
+ if (!window_priv)
+ return BadAlloc;
+
+ target_crtc = present_wnmd_get_crtc(screen_priv, window);
+
+ ret = present_wnmd_get_ust_msc(screen, window, &ust, &crtc_msc);
+
+ target_msc = present_wnmd_window_to_crtc_msc(window, target_crtc, window_msc, crtc_msc);
+
+ if (ret == Success) {
+ /* Stash the current MSC away in case we need it later
+ */
+ window_priv->msc = crtc_msc;
+ }
+
+ present_adjust_timings(options,
+ &crtc_msc,
+ &target_msc,
+ divisor,
+ remainder);
+
+ /*
+ * Look for a matching presentation already on the list...
+ */
+
+ if (!update && pixmap) {
+ xorg_list_for_each_entry_safe(vblank, tmp, &window_priv->vblank, window_list) {
+
+ if (!vblank->pixmap)
+ continue;
+
+ if (!vblank->queued)
+ continue;
+
+ if (vblank->target_msc != target_msc)
+ continue;
+
+ present_vblank_scrap(vblank);
+ if (vblank->flip_ready)
+ present_wnmd_re_execute(vblank);
+ }
+ }
+
+ vblank = present_vblank_create(window,
+ pixmap,
+ serial,
+ valid,
+ update,
+ x_off,
+ y_off,
+ target_crtc,
+ wait_fence,
+ idle_fence,
+ options,
+ &screen_priv->wnmd_info->capabilities,
+ notifies,
+ num_notifies,
+ &target_msc,
+ crtc_msc);
+ if (!vblank)
+ return BadAlloc;
+
+ xorg_list_append(&vblank->event_queue, &window_priv->exec_queue);
+ vblank->queued = TRUE;
+ if (crtc_msc < target_msc) {
+ if (present_wnmd_queue_vblank(screen, window, target_crtc, vblank->event_id, target_msc) == Success) {
+ return Success;
+ }
+ DebugPresent(("present_queue_vblank failed\n"));
+ }
+
+ present_wnmd_execute(vblank, ust, crtc_msc);
+ return Success;
+}
+
+static void
+present_wnmd_abort_vblank(ScreenPtr screen, WindowPtr window, RRCrtcPtr crtc, uint64_t event_id, uint64_t msc)
+{
+ present_screen_priv_ptr screen_priv = present_screen_priv(screen);
+ present_window_priv_ptr window_priv = present_window_priv(window);
+ present_vblank_ptr vblank;
+
+ assert(crtc);
+
+ (*screen_priv->wnmd_info->abort_vblank) (window, crtc, event_id, msc);
+
+ xorg_list_for_each_entry(vblank, &window_priv->exec_queue, event_queue) {
+ if (vblank->event_id == event_id) {
+ xorg_list_del(&vblank->event_queue);
+ vblank->queued = FALSE;
+ return;
+ }
+ }
+ xorg_list_for_each_entry(vblank, &window_priv->flip_queue, event_queue) {
+ if (vblank->event_id == event_id) {
+ xorg_list_del(&vblank->event_queue);
+ vblank->queued = FALSE;
+ return;
+ }
+ }
+}
+
+static void
+present_wnmd_flip_destroy(ScreenPtr screen)
+{
+ /* Cleanup done on window destruction */
+}
+
+static void
+present_wnmd_flush(WindowPtr window)
+{
+ ScreenPtr screen = window->drawable.pScreen;
+ present_screen_priv_ptr screen_priv = present_screen_priv(screen);
+
+ (*screen_priv->wnmd_info->flush) (window);
+}
+
+void
+present_wnmd_init_mode_hooks(present_screen_priv_ptr screen_priv)
+{
+ screen_priv->query_capabilities = &present_wnmd_query_capabilities;
+ screen_priv->get_crtc = &present_wnmd_get_crtc;
+
+ screen_priv->check_flip = &present_wnmd_check_flip;
+ screen_priv->check_flip_window = &present_wnmd_check_flip_window;
+
+ screen_priv->present_pixmap = &present_wnmd_pixmap;
+ screen_priv->create_event_id = &present_wnmd_create_event_id;
+ screen_priv->queue_vblank = &present_wnmd_queue_vblank;
+ screen_priv->flush = &present_wnmd_flush;
+ screen_priv->re_execute = &present_wnmd_re_execute;
+
+ screen_priv->abort_vblank = &present_wnmd_abort_vblank;
+ screen_priv->flip_destroy = &present_wnmd_flip_destroy;
+}
--
2.7.4
More information about the xorg-devel
mailing list