diff options
| author | Keith Packard <keithp@guitar.keithp.com> | 2007-02-15 20:36:20 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@guitar.keithp.com> | 2007-02-15 20:36:20 -0800 |
| commit | d4eb4d065032112a38444e36f791cb468a5ca8f4 (patch) | |
| tree | 7414d13721f1009f92460f7967ea4bec3d015915 /hw/xfree86/ramdac/xf86Cursor.c | |
| parent | 37fe4c49dc3a5faf2d3d56112b6bd78453045f6a (diff) | |
Merge crtc/output-based mode selection code.
This code comes from the intel driver, so there's no history in this tree.
As the crtc/output-based mode selection code uses ddc, the ddc and i2c
modules have been merged into the server. Attempts to load them are safely
ignored now.
Diffstat (limited to 'hw/xfree86/ramdac/xf86Cursor.c')
| -rw-r--r-- | hw/xfree86/ramdac/xf86Cursor.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c index a903f7f02..457807698 100644 --- a/hw/xfree86/ramdac/xf86Cursor.c +++ b/hw/xfree86/ramdac/xf86Cursor.c @@ -199,10 +199,11 @@ xf86CursorEnableDisableFBAccess( pScreen->devPrivates[xf86CursorScreenIndex].ptr; if (!enable && ScreenPriv->CurrentCursor != NullCursor) { - ScreenPriv->SavedCursor = ScreenPriv->CurrentCursor; + CursorPtr currentCursor = ScreenPriv->CurrentCursor; xf86CursorSetCursor(pScreen, NullCursor, ScreenPriv->x, ScreenPriv->y); ScreenPriv->isUp = FALSE; ScreenPriv->SWCursor = TRUE; + ScreenPriv->SavedCursor = currentCursor; } if (ScreenPriv->EnableDisableFBAccess) |