xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/drivers/modesetting/drmmode_display.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 714736124f2bfba9ede076eff3bf017f986ce6c4
Author: Keith Packard <keithp at keithp.com>
Date:   Fri May 27 02:02:48 2016 -0700

    modesetting: Use new xf86CurrentCursor API
    
    Use this instead of the (now deprecated) cursor pointer in the
    xf86CrtcConfigRec.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index 2cda523..8ca0c26 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -553,8 +553,7 @@ drmmode_set_cursor(xf86CrtcPtr crtc)
     int ret;
 
     if (use_set_cursor2) {
-        xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
-        CursorPtr cursor = xf86_config->cursor;
+        CursorPtr cursor = xf86CurrentCursor(crtc->scrn->pScreen);
 
         ret =
             drmModeSetCursor2(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,