Attachment 3689 Details for Bug 4951 – Proposed fix

[patch] Proposed fix

radeon-exa-hwcursor.diff (text/plain), 4.35 KB, created by Michel Dänzer on 2005-11-03 05:02:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2005-11-03 05:02:05 UTC

Size: 4.35 KB

patch

obsolete

>Index: programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c,v
>retrieving revision 1.8
>diff -p -u -r1.8 radeon_cursor.c
>--- programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c	11 Sep 2005 20:58:53 -0000	1.8
>+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c	3 Nov 2005 12:38:34 -0000
>@@ -102,6 +102,45 @@ static CARD32 mono_cursor_color[] = {
> #endif
> 
> 
>+#ifdef USE_EXA
>+static void
>+RADEONCursorSave(ScreenPtr pScreen, ExaOffscreenArea *area)
>+{
>+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
>+    RADEONInfoPtr info = RADEONPTR(pScrn);
>+
>+    info->cursorArea = NULL;
>+    info->cursor_offset = 0;
>+}
>+
>+static void
>+RADEONCursorAllocEXA(ScreenPtr pScreen)
>+{
>+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
>+    RADEONInfoPtr info = RADEONPTR(pScrn);
>+
>+    info->cursorArea = exaOffscreenAlloc(pScreen,
>+					 CURSOR_WIDTH * 4 * CURSOR_HEIGHT,
>+					 128, TRUE, RADEONCursorSave, info);
>+
>+    if (!info->cursorArea) {
>+	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
>+		   "Hardware cursor temporarily disabled"
>+		   " due to insufficient offscreen memory\n");
>+	info->cursor_offset = 0;
>+    } else {
>+	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
>+		   "Using hardware cursor\n",
>+		   info->cursor_offset = info->cursorArea->offset);
>+
>+	RADEONTRACE(("%s (0x%08x-0x%08x)\n", __func__,
>+		     info->cursor_offset,
>+		     info->cursor_offset + info->cursorArea->size));
>+    }
>+}
>+#endif
>+
>+
> /* Set cursor foreground and background colors */
> static void RADEONSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
> {
>@@ -277,6 +316,13 @@ static Bool RADEONUseHWCursor(ScreenPtr 
>     ScrnInfoPtr    pScrn = xf86Screens[pScreen->myNum];
>     RADEONInfoPtr  info  = RADEONPTR(pScrn);
> 
>+ #ifdef USE_EXA
>+    if (!info->cursor_offset && info->useEXA && info->cursor)
>+    {
>+	RADEONCursorAllocEXA(pScreen);
>+    }
>+#endif
>+
>     return info->cursor_offset ? TRUE : FALSE;
> }
> 
>@@ -288,7 +334,7 @@ static Bool RADEONUseHWCursorARGB (Scree
>     ScrnInfoPtr    pScrn = xf86Screens[pScreen->myNum];
>     RADEONInfoPtr  info  = RADEONPTR(pScrn);
> 
>-    if (info->cursor_offset &&
>+    if (RADEONUseHWCursor(pScreen, pCurs) &&
> 	pCurs->bits->height <= CURSOR_HEIGHT && pCurs->bits->width <= CURSOR_WIDTH)
> 	return TRUE;
>     return FALSE;
>@@ -359,18 +405,6 @@ static void RADEONLoadCursorARGB (ScrnIn
> 
> #endif
> 
>-#ifdef USE_EXA
>-static void
>-ATICursorSave(ScreenPtr pScreen, ExaOffscreenArea *area)
>-{
>-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
>-    RADEONInfoPtr info = RADEONPTR(pScrn);
>-
>-    info->cursorArea = NULL;
>-    info->cursor_offset = 0;
>-}
>-#endif
>-
> 
> /* Initialize hardware cursor support. */
> Bool RADEONCursorInit(ScreenPtr pScreen)
>@@ -417,21 +451,7 @@ Bool RADEONCursorInit(ScreenPtr pScreen)
> 
> #ifdef USE_EXA
>     if (info->useEXA) {
>-	info->cursorArea = exaOffscreenAlloc(pScreen, size_bytes,
>-                                             128, TRUE, ATICursorSave, info);
>-
>-	if (!info->cursorArea) {
>-	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
>-		       "Hardware cursor disabled"
>-		       " due to insufficient offscreen memory\n");
>-	    info->cursor_offset = 0;
>-	} else {
>-	    info->cursor_offset = info->cursorArea->offset;
>-	}
>-
>-	RADEONTRACE(("RADEONCursorInit (0x%08x-0x%08x)\n",
>-		     info->cursor_offset,
>-		     info->cursor_offset + info->cursorArea->size));
>+	RADEONCursorAllocEXA(pScreen);
>     }
> #endif /* USE_EXA */
> #ifdef USE_XAA
>Index: programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v
>retrieving revision 1.79
>diff -p -u -r1.79 radeon_driver.c
>--- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c	9 Oct 2005 10:36:50 -0000	1.79
>+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c	3 Nov 2005 12:38:41 -0000
>@@ -5689,13 +5689,6 @@ _X_EXPORT Bool RADEONScreenInit(int scrn
>     /* Hardware cursor setup */
>     if (!xf86ReturnOptValBool(info->Options, OPTION_SW_CURSOR, FALSE)) {
> 	if (RADEONCursorInit(pScreen)) {
>-#ifdef USE_EXA
>-	    if (info->useEXA) {
>-		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
>-			   "Using hardware cursor (offset %d)\n",
>-			   info->cursor_offset);
>-	    }
>-#endif /* USE_EXA */
> #ifdef USE_XAA
> 	    if (!info->useEXA) {
> 		int  width, height;

Actions: View | Splinter Review

Attachments on bug 4951: 3689

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.