xserver: Branch 'master'

[GitLab Mirror]

 present/present_scmd.c |   13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

New commits:
commit 4adda1f6359fd96436dd61d0250b84f55b2fd277
Author: Roman Gilg <subdiff at gmail.com>
Date:   Fri Mar 29 10:55:31 2019 +0100

    present: Call present_vblank_scrap in screen mode
    
    This cleans up some code duplication. No functional change.
    
    Signed-off-by: Roman Gilg <subdiff at gmail.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/present/present_scmd.c b/present/present_scmd.c
index 3b7fbd832..7c2f80997 100644
--- a/present/present_scmd.c
+++ b/present/present_scmd.c
@@ -716,18 +716,7 @@ present_scmd_pixmap(WindowPtr window,
             if (vblank->crtc != target_crtc || vblank->target_msc != target_msc)
                 continue;
 
-            DebugPresent(("\tx %" PRIu64 " %p %" PRIu64 ": %08" PRIx32 " -> %08" PRIx32 " (crtc %p)\n",
-                          vblank->event_id, vblank, vblank->target_msc,
-                          vblank->pixmap->drawable.id, vblank->window->drawable.id,
-                          vblank->crtc));
-
-            present_pixmap_idle(vblank->pixmap, vblank->window, vblank->serial, vblank->idle_fence);
-            present_fence_destroy(vblank->idle_fence);
-            dixDestroyPixmap(vblank->pixmap, vblank->pixmap->drawable.id);
-
-            vblank->pixmap = NULL;
-            vblank->idle_fence = NULL;
-            vblank->flip = FALSE;
+            present_vblank_scrap(vblank);
             if (vblank->flip_ready)
                 present_re_execute(vblank);
         }