Attachment 128990 Details for Bug 99358 – Take the input lock for RecolorCursor

[patch] Take the input lock for RecolorCursor

0001-xfree86-Take-the-input-lock-for-xf86RecolorCursor.patch (text/plain), 2.54 KB, created by Chris Wilson on 2017-01-16 22:23:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2017-01-16 22:23:39 UTC

Size: 2.54 KB

patch

obsolete

>From e7f1ee6513750487a09d965c397fc840abed15e8 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Mon, 16 Jan 2017 22:17:36 +0000
>Subject: [PATCH xserver] xfree86: Take the input lock for xf86RecolorCursor
>
>xf86RecolorCursor() may be called directly from XRecolorCursor as well
>as from xf86ScreenSetCursor(). In the latter case, the input lock is
>already held, but not for the former and so we need to add a wrapper
>function that acquires the input lock before performing
>xf86RecolorCursor()
>
>References: https://bugs.freedesktop.org/show_bug.cgi?id=99358
>---
> hw/xfree86/ramdac/xf86HWCurs.c | 24 ++++++++++++++++++------
> 1 file changed, 18 insertions(+), 6 deletions(-)
>
>diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c
>index 448132095..55d5861c1 100644
>--- a/hw/xfree86/ramdac/xf86HWCurs.c
>+++ b/hw/xfree86/ramdac/xf86HWCurs.c
>@@ -22,6 +22,9 @@
> 
> #include "servermd.h"
> 
>+static void
>+xf86RecolorCursor_locked(xf86CursorScreenPtr ScreenPriv, CursorPtr pCurs);
>+
> static CARD32
> xf86ReverseBitOrder(CARD32 v)
> {
>@@ -204,7 +207,7 @@ xf86ScreenSetCursor(ScreenPtr pScreen, CursorPtr pCurs, int x, int y)
>         if (!xf86DriverLoadCursorImage (infoPtr, bits))
>             return FALSE;
> 
>-    xf86RecolorCursor(pScreen, pCurs, 1);
>+    xf86RecolorCursor_locked (ScreenPriv, pCurs);
> 
>     (*infoPtr->SetCursorPosition) (infoPtr->pScrn, x, y);
> 
>@@ -312,12 +315,9 @@ xf86MoveCursor(ScreenPtr pScreen, int x, int y)
>     input_unlock();
> }
> 
>-void
>-xf86RecolorCursor(ScreenPtr pScreen, CursorPtr pCurs, Bool displayed)
>+static void
>+xf86RecolorCursor_locked(xf86CursorScreenPtr ScreenPriv, CursorPtr pCurs)
> {
>-    xf86CursorScreenPtr ScreenPriv =
>-        (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
>-                                               xf86CursorScreenKey);
>     xf86CursorInfoPtr infoPtr = ScreenPriv->CursorInfoPtr;
> 
>     /* recoloring isn't applicable to ARGB cursors and drivers
>@@ -357,6 +357,18 @@ xf86RecolorCursor(ScreenPtr pScreen, CursorPtr pCurs, Bool displayed)
>     }
> }
> 
>+void
>+xf86RecolorCursor(ScreenPtr pScreen, CursorPtr pCurs, Bool displayed)
>+{
>+    xf86CursorScreenPtr ScreenPriv =
>+        (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
>+                                               xf86CursorScreenKey);
>+
>+    input_lock();
>+    xf86RecolorCursor_locked (ScreenPriv, pCurs);
>+    input_unlock();
>+}
>+
> /* These functions assume that MaxWidth is a multiple of 32 */
> static unsigned char *
> RealizeCursorInterleave0(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
>-- 
>2.11.0
>

Actions: View | Splinter Review

Attachments on bug 99358: 128887 | 128990 | 128991 | 129063 | 129064

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.