diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2015-02-08 09:47:40 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2015-12-07 14:25:42 -0500 |
| commit | b2d55338f6b8f43ebcb49994abad123a797248cf (patch) | |
| tree | 7f965f2504b5672ef8b17f05146ed8f8a4c29266 /present | |
| parent | 548a3d5fd69bb059bbaf26ededdc94c212712cd7 (diff) | |
present: Requery pending flips with the right sync_flip mode
When verifying whether a pending flip is still valid, we need to pass
down the orignal sync_flip mode (e.g. if the driver only supports sync
flips, verifying a async flip will falsely fail).
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Diffstat (limited to 'present')
| -rw-r--r-- | present/present.c | 5 | ||||
| -rw-r--r-- | present/present_priv.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/present/present.c b/present/present.c index beb01dcbd..7af6bb7b8 100644 --- a/present/present.c +++ b/present/present.c @@ -453,6 +453,7 @@ present_flip_notify(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_msc) screen_priv->flip_window = vblank->window; screen_priv->flip_serial = vblank->serial; screen_priv->flip_pixmap = vblank->pixmap; + screen_priv->flip_sync = vblank->sync_flip; screen_priv->flip_idle_fence = vblank->idle_fence; vblank->pixmap = NULL; @@ -541,14 +542,14 @@ present_check_flip_window (WindowPtr window) * Check current flip */ if (window == screen_priv->flip_window) { - if (!present_check_flip(screen_priv->flip_crtc, window, screen_priv->flip_pixmap, FALSE, NULL, 0, 0)) + if (!present_check_flip(screen_priv->flip_crtc, window, screen_priv->flip_pixmap, screen_priv->flip_sync, NULL, 0, 0)) present_unflip(screen); } } /* Now check any queued vblanks */ xorg_list_for_each_entry(vblank, &window_priv->vblank, window_list) { - if (vblank->queued && vblank->flip && !present_check_flip(vblank->crtc, window, vblank->pixmap, FALSE, NULL, 0, 0)) + if (vblank->queued && vblank->flip && !present_check_flip(vblank->crtc, window, vblank->pixmap, vblank->sync_flip, NULL, 0, 0)) vblank->flip = FALSE; } } diff --git a/present/present_priv.h b/present/present_priv.h index 996292e94..d007fdb24 100644 --- a/present/present_priv.h +++ b/present/present_priv.h @@ -93,6 +93,7 @@ typedef struct present_screen_priv { uint32_t flip_serial; PixmapPtr flip_pixmap; present_fence_ptr flip_idle_fence; + Bool flip_sync; present_screen_info_ptr info; } present_screen_priv_rec, *present_screen_priv_ptr; |