diff options
author | Keith Packard <keithp@keithp.com> | 2013-11-11 18:03:42 -0800 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2013-11-20 13:12:30 -0800 |
commit | 8bdd2ccc776ded3f527596b5009ef25129aa3287 (patch) | |
tree | 3976db4b3214f0f79953b1a093e603d32b715b2f /present/present.c | |
parent | e5a188cb919edee2e3a03054276bce0db02f7b62 (diff) |
present: Block for wait_fence in present_execute
Pend presentation until wait_fence is also triggered by having the
SyncFence trigger invoke present_execute once triggered.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'present/present.c')
-rw-r--r-- | present/present.c | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/present/present.c b/present/present.c index 67d7f6eee..16dc3811e 100644 --- a/present/present.c +++ b/present/present.c @@ -453,6 +453,26 @@ present_check_flip_window (WindowPtr window) } /* + * Called when the wait fence is triggered; just gets the current msc/ust and + * calls present_execute again. That will re-check the fence and pend the + * request again if it's still not actually ready + */ +static void +present_wait_fence_triggered(void *param) +{ + present_vblank_ptr vblank = param; + WindowPtr window = vblank->window; + uint64_t ust = 0, crtc_msc = 0; + + if (window) { + present_window_priv_ptr window_priv = present_get_window_priv(window, TRUE); + if (window_priv) + (void) present_get_ust_msc(window, window_priv->crtc, &ust, &crtc_msc); + } + present_execute(vblank, ust, crtc_msc); +} + +/* * Once the required MSC has been reached, execute the pending request. * * For requests to actually present something, either blt contents to @@ -469,7 +489,10 @@ present_execute(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_msc) present_screen_priv_ptr screen_priv = present_screen_priv(window->drawable.pScreen); if (vblank->wait_fence) { - /* XXX check fence, queue if not ready */ + if (!present_fence_check_triggered(vblank->wait_fence)) { + present_fence_set_callback(vblank->wait_fence, present_wait_fence_triggered, vblank); + return; + } } xorg_list_del(&vblank->event_queue); @@ -654,6 +677,12 @@ present_pixmap(WindowPtr window, target_msc--; } + if (wait_fence) { + vblank->wait_fence = present_fence_create(wait_fence); + if (!vblank->wait_fence) + goto no_mem; + } + if (idle_fence) { vblank->idle_fence = present_fence_create(idle_fence); if (!vblank->idle_fence) @@ -764,6 +793,9 @@ present_vblank_destroy(present_vblank_ptr vblank) if (vblank->update) RegionDestroy(vblank->update); + if (vblank->wait_fence) + present_fence_destroy(vblank->wait_fence); + if (vblank->idle_fence) present_fence_destroy(vblank->idle_fence); |