xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/drivers/modesetting/drmmode_display.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit bc3eed379ee5b4176db848708799fb2d5db16531
Author: Hans De Goede <hdegoede at redhat.com>
Date:   Wed Aug 31 15:37:20 2016 +0200

    modesetting: Hide cursor when initializing crtc
    
    When Xorg gets started directly from a wayland-gdm the crtc still has the
    wayland hw cursor set. Combine this with Xorg immediately falling back to
    a sw cursor because a slave-output has a monitor attached at startup; and
    we end up with the wayland hardware cursor overlay fixed in its last
    position + the Xorg sw cursor resulting in 2 cursors.
    
    This commit fixes this by hiding any left-over cursors when initializing
    the crtc.
    
    Signed-off-by: Hans de Goede <hdegoede at redhat.com>
    Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>

diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index dd8cc71..6b933e4 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -1145,6 +1145,9 @@ drmmode_crtc_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, drmModeResPtr mode_res
     drmmode_crtc->vblank_pipe = drmmode_crtc_vblank_pipe(num);
     crtc->driver_private = drmmode_crtc;
 
+    /* Hide any cursors which may be active from previous users */
+    drmModeSetCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, 0, 0, 0);
+
     /* Mark num'th crtc as in use on this device. */
     ms_ent->assigned_crtcs |= (1 << num);
     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, MS_LOGLEVEL_DEBUG,