xserver: Branch 'master'

[Keith Packard]

 present/present.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 882f2d10d99a04a96afc0ce0c8937e16bec3afb5
Author: Axel Davy <axel.davy at ens.fr>
Date:   Wed Oct 29 13:31:42 2014 +0100

    Fix present_notify to return right away when querying current or past msc.
    
    When the target msc is past or is the current one, we want to get immediate
    feedback. This patch fixes this behaviour.
    
    Signed-off-by: Axel Davy <axel.davy at ens.fr>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/present/present.c b/present/present.c
index 47566c7..a9f2214 100644
--- a/present/present.c
+++ b/present/present.c
@@ -866,7 +866,7 @@ present_pixmap(WindowPtr window,
 
     xorg_list_add(&vblank->event_queue, &present_exec_queue);
     vblank->queued = TRUE;
-    if (target_msc >= crtc_msc) {
+    if ((pixmap && target_msc >= crtc_msc) || (!pixmap && target_msc > crtc_msc)) {
         ret = present_queue_vblank(screen, target_crtc, vblank->event_id, target_msc);
         if (ret != Success) {
             xorg_list_del(&vblank->event_queue);
@@ -929,7 +929,7 @@ present_notify_msc(WindowPtr window,
                           0, 0,
                           NULL,
                           NULL, NULL,
-                          0,
+                          PresentOptionAsync,
                           target_msc, divisor, remainder, NULL, 0);
 }