From b0b04cb266a62675dd7cde97111ebe7c1552db9a Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 6 Sep 2016 13:14:35 +0200 Subject: [PATCH] xf86Cursor: Fix xf86CurrentCursor to work on slave GPU Screens MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The CurrentCursor is always attached to the master GPU. Signed-off-by: Hans de Goede Reviewed-by: Michel Dänzer --- hw/xfree86/ramdac/xf86Cursor.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c index 0c5d6c9bd..623a65b33 100644 --- a/hw/xfree86/ramdac/xf86Cursor.c +++ b/hw/xfree86/ramdac/xf86Cursor.c @@ -458,9 +458,12 @@ xf86ForceHWCursor(ScreenPtr pScreen, Bool on) CursorPtr xf86CurrentCursor(ScreenPtr pScreen) { - xf86CursorScreenPtr ScreenPriv = - (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates, - xf86CursorScreenKey); + xf86CursorScreenPtr ScreenPriv; + + if (pScreen->is_output_slave) + pScreen = pScreen->current_master; + + ScreenPriv = dixLookupPrivate(&pScreen->devPrivates, xf86CursorScreenKey); return ScreenPriv->CurrentCursor; }