Attachment 4105 Details for Bug 4633 – Proposed fix

[patch] Proposed fix

ramdac-fbaccess.diff (text/plain), 6.68 KB, created by Michel Dänzer on 2005-12-16 19:52:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2005-12-16 19:52:39 UTC

Size: 6.68 KB

patch

obsolete

>Index: programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c,v
>retrieving revision 1.3
>diff -p -u -r1.3 xf86Cursor.c
>--- programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c	3 Jul 2005 07:01:38 -0000	1.3
>+++ programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c	15 Dec 2005 20:11:44 -0000
>@@ -37,10 +37,8 @@ static void xf86CursorQueryBestSize(int,
> 
> /* ScrnInfoRec functions */
> 
>+static void xf86CursorEnableDisableFBAccess(int, Bool);
> static Bool xf86CursorSwitchMode(int, DisplayModePtr,int);
>-static Bool xf86CursorEnterVT(int, int);
>-static void xf86CursorLeaveVT(int, int);
>-static int  xf86CursorSetDGAMode(int, int, DGADevicePtr);
> 
> Bool
> xf86InitCursor(
>@@ -98,19 +96,15 @@ xf86InitCursor(
>     ScreenPriv->spriteFuncs = PointPriv->spriteFuncs;
>     PointPriv->spriteFuncs = &xf86CursorSpriteFuncs;
> 
>+    ScreenPriv->EnableDisableFBAccess = pScrn->EnableDisableFBAccess;
>     ScreenPriv->SwitchMode = pScrn->SwitchMode;
>-    ScreenPriv->EnterVT = pScrn->EnterVT;
>-    ScreenPriv->LeaveVT = pScrn->LeaveVT;
>-    ScreenPriv->SetDGAMode = pScrn->SetDGAMode;
>     
>     ScreenPriv->ForceHWCursorCount = 0;
>     ScreenPriv->HWCursorForced = FALSE;
> 
>+    pScrn->EnableDisableFBAccess = xf86CursorEnableDisableFBAccess;
>     if (pScrn->SwitchMode)
> 	pScrn->SwitchMode = xf86CursorSwitchMode;
>-    pScrn->EnterVT = xf86CursorEnterVT;
>-    pScrn->LeaveVT = xf86CursorLeaveVT;
>-    pScrn->SetDGAMode = xf86CursorSetDGAMode;
> 
>     return TRUE;
> }
>@@ -138,10 +132,8 @@ xf86CursorCloseScreen(int i, ScreenPtr p
>     PointPriv->spriteFuncs = ScreenPriv->spriteFuncs;
>     PointPriv->showTransparent = ScreenPriv->showTransparent;
> 
>+    pScrn->EnableDisableFBAccess = ScreenPriv->EnableDisableFBAccess;
>     pScrn->SwitchMode = ScreenPriv->SwitchMode;
>-    pScrn->EnterVT = ScreenPriv->EnterVT;
>-    pScrn->LeaveVT = ScreenPriv->LeaveVT;
>-    pScrn->SetDGAMode = ScreenPriv->SetDGAMode;
> 
>     xfree(ScreenPriv->transparentData);
>     xfree(ScreenPriv);
>@@ -199,86 +191,62 @@ xf86CursorRecolorCursor(
> 
> /***** ScrnInfoRec functions *********/
> 
>-static Bool
>-xf86CursorSwitchMode(int index, DisplayModePtr mode, int flags)
>+static void
>+xf86CursorEnableDisableFBAccess(
>+    int index,
>+    Bool enable)
> {
>-    Bool ret;
>     ScreenPtr pScreen = screenInfo.screens[index];
>     xf86CursorScreenPtr ScreenPriv =
> 	pScreen->devPrivates[xf86CursorScreenIndex].ptr;
>-    miPointerScreenPtr PointPriv =
>-	pScreen->devPrivates[miPointerScreenIndex].ptr;
>+    xf86CursorInfoPtr infoPtr = ScreenPriv->CursorInfoPtr;
> 
>-    if (ScreenPriv->isUp) {
>-	xf86SetCursor(pScreen, NullCursor, ScreenPriv->x, ScreenPriv->y);
>+    if (!enable && ScreenPriv->CurrentCursor != NullCursor) {
>+	ScreenPriv->SavedCursor = ScreenPriv->CurrentCursor;
>+	xf86CursorSetCursor(pScreen, NullCursor, ScreenPriv->x, ScreenPriv->y);
> 	ScreenPriv->isUp = FALSE;
>+	ScreenPriv->SWCursor = TRUE;
>     }
> 
>-    ret = (*ScreenPriv->SwitchMode)(index, mode, flags);
>+    if (ScreenPriv->EnableDisableFBAccess)
>+	(*ScreenPriv->EnableDisableFBAccess)(index, enable);
> 
>-    /*
>-     * Cannot restore cursor here because the new frame[XY][01] haven't been
>-     * calculated yet.  However, because the hardware cursor was removed above,
>-     * ensure the cursor is repainted by miPointerWarpCursor().
>-     */
>-    ScreenPriv->CursorToRestore = ScreenPriv->CurrentCursor;
>-    PointPriv->waitForUpdate = FALSE;	/* Force cursor repaint */
>-
>-    return ret;
>+    if (enable && ScreenPriv->SavedCursor)
>+    {
>+	/*
>+	 * Re-set current cursor so drivers can react to FB access having been
>+	 * temporarily disabled.
>+	 */
>+	xf86CursorSetCursor(pScreen, ScreenPriv->SavedCursor,
>+			    ScreenPriv->x, ScreenPriv->y);
>+	ScreenPriv->SavedCursor = NULL;
>+    }
> }
> 
> static Bool
>-xf86CursorEnterVT(int index, int flags)
>+xf86CursorSwitchMode(int index, DisplayModePtr mode, int flags)
> {
>     Bool ret;
>     ScreenPtr pScreen = screenInfo.screens[index];
>     xf86CursorScreenPtr ScreenPriv =
> 	pScreen->devPrivates[xf86CursorScreenIndex].ptr;
>-
>-    ret = (*ScreenPriv->EnterVT)(index, flags);
>-
>-    if (ScreenPriv->CurrentCursor)
>-	xf86CursorSetCursor(pScreen, ScreenPriv->CurrentCursor,
>-			ScreenPriv->x, ScreenPriv->y);
>-    return ret;
>-}
>-
>-static void
>-xf86CursorLeaveVT(int index, int flags)
>-{
>-    ScreenPtr pScreen = screenInfo.screens[index];
>-    xf86CursorScreenPtr ScreenPriv =
>-	pScreen->devPrivates[xf86CursorScreenIndex].ptr;
>+    miPointerScreenPtr PointPriv =
>+	pScreen->devPrivates[miPointerScreenIndex].ptr;
> 
>     if (ScreenPriv->isUp) {
> 	xf86SetCursor(pScreen, NullCursor, ScreenPriv->x, ScreenPriv->y);
> 	ScreenPriv->isUp = FALSE;
>     }
>-    ScreenPriv->SWCursor = TRUE;
>-
>-    (*ScreenPriv->LeaveVT)(index, flags);
>-}
>-
>-static int
>-xf86CursorSetDGAMode(int index, int num, DGADevicePtr devRet)
>-{
>-    ScreenPtr pScreen = screenInfo.screens[index];
>-    xf86CursorScreenPtr ScreenPriv =
>-	pScreen->devPrivates[xf86CursorScreenIndex].ptr;
>-    int ret;
> 
>-    if (num && ScreenPriv->isUp) {
>-	xf86SetCursor(pScreen, NullCursor, ScreenPriv->x, ScreenPriv->y);
>-	ScreenPriv->isUp = FALSE;
>-	ScreenPriv->SWCursor = TRUE;
>-    }
>-
>-    ret = (*ScreenPriv->SetDGAMode)(index, num, devRet);
>+    ret = (*ScreenPriv->SwitchMode)(index, mode, flags);
> 
>-    if (ScreenPriv->CurrentCursor && (!num || (ret != Success))) {
>-	xf86CursorSetCursor(pScreen, ScreenPriv->CurrentCursor,
>-			ScreenPriv->x, ScreenPriv->y);
>-    }
>+    /*
>+     * Cannot restore cursor here because the new frame[XY][01] haven't been
>+     * calculated yet.  However, because the hardware cursor was removed above,
>+     * ensure the cursor is repainted by miPointerWarpCursor().
>+     */
>+    ScreenPriv->CursorToRestore = ScreenPriv->CurrentCursor;
>+    PointPriv->waitForUpdate = FALSE;	/* Force cursor repaint */
> 
>     return ret;
> }
>Index: programs/Xserver/hw/xfree86/ramdac/xf86CursorPriv.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/ramdac/xf86CursorPriv.h,v
>retrieving revision 1.3
>diff -p -u -r1.3 xf86CursorPriv.h
>--- programs/Xserver/hw/xfree86/ramdac/xf86CursorPriv.h	3 Jul 2005 07:01:38 -0000	1.3
>+++ programs/Xserver/hw/xfree86/ramdac/xf86CursorPriv.h	15 Dec 2005 20:11:44 -0000
>@@ -28,9 +28,8 @@ typedef struct {
>     Bool			PalettedCursor;
>     ColormapPtr			pInstalledMap;
>     Bool                	(*SwitchMode)(int, DisplayModePtr,int);
>-    Bool                	(*EnterVT)(int, int);
>-    void                	(*LeaveVT)(int, int);
>-    int				(*SetDGAMode)(int, int, DGADevicePtr);
>+    xf86EnableDisableFBAccessProc *EnableDisableFBAccess;
>+    CursorPtr                   SavedCursor;
> 
>     /* Number of requests to force HW cursor */
>     int				ForceHWCursorCount;

Actions: View | Splinter Review

Attachments on bug 4633: 3425 | 3736 | 3754 | 4105

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.