xserver: Branch 'master'

[Adam Jackson]

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

New commits:
commit 47bc7fcaa567b0d9e2627b4a21b112e96f81725b
Author: Dave Airlie <airlied at gmail.com>
Date:   Tue Feb 9 16:54:22 2016 +1000

    present: fail flipping if we have any slave outputs
    
    Due to the way present currently works, we don't ever check with the
    secondary adapters if we can flip at all.
    
    We shouldn't flip if the secondary adapters are attached to the pixmap
    currently, however using the current check_flip callback isn't possible
    as it passes the Window to the driver (something we shouldn't be doing),
    so the slave driver can never get it's own screen ptr back.
    
    For now to fix the problem just block flips if we have any slaves
    configured. We can fix the ABI up later, but this fix can be backported
    to stable.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>
    Reviewed-by: Keith Packard <keithp at keithp.com>

diff --git a/present/present.c b/present/present.c
index 1ce16af..55f6aa7 100644
--- a/present/present.c
+++ b/present/present.c
@@ -144,6 +144,10 @@ present_check_flip(RRCrtcPtr    crtc,
     if (!screen_priv->info->flip)
         return FALSE;
 
+    /* Fail to flip if we have slave outputs */
+    if (!xorg_list_is_empty(&screen->output_slave_list))
+        return FALSE;
+
     /* Make sure the window hasn't been redirected with Composite */
     window_pixmap = screen->GetWindowPixmap(window);
     if (window_pixmap != screen->GetScreenPixmap(screen) &&