xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/drivers/modesetting/pageflip.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 85b3fc18606e56d01734defb0e9fa04182f9fc1c
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Thu Mar 29 09:42:08 2018 +0200

    modesetting: Use actual crtc position for pageflip
    
    Otherwise the same content is shown on all outputs.
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Reviewed-by: Daniel Stone <daniels at collabora.comM>

diff --git a/hw/xfree86/drivers/modesetting/pageflip.c b/hw/xfree86/drivers/modesetting/pageflip.c
index 17a87866a..5278b1485 100644
--- a/hw/xfree86/drivers/modesetting/pageflip.c
+++ b/hw/xfree86/drivers/modesetting/pageflip.c
@@ -167,7 +167,7 @@ do_queue_flip_on_crtc(modesettingPtr ms, xf86CrtcPtr crtc,
 
     if (ms->atomic_modeset) {
         flags |= DRM_MODE_ATOMIC_NONBLOCK;
-        return drmmode_crtc_set_fb(crtc, NULL, ms->drmmode.fb_id, 0, 0, flags,
+        return drmmode_crtc_set_fb(crtc, NULL, ms->drmmode.fb_id, crtc->x, crtc->y, flags,
                                    (void *) (uintptr_t) seq);
     }