Attachment 9994 Details for Bug 10815 – HW cursor cleanup

[patch] HW cursor cleanup

radeon-hwcursor-cleanup.patch (text/plain), 5.77 KB, created by Michel Dänzer on 2007-05-17 05:43:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2007-05-17 05:43:47 UTC

Size: 5.77 KB

patch

obsolete

>radeon: HW cursor cleanup.
>
>From: Michel DÃ¤nzer <michel@tungstengraphics.com>
>
>Don't needlessly turn the HW cursor on/off in RADEONLoadCursor*().
>---
>
> src/radeon_cursor.c |   64 +++++++++------------------------------------------
> src/radeon_reg.h    |    2 +-
> 2 files changed, 12 insertions(+), 54 deletions(-)
>
>diff --git a/src/radeon_cursor.c b/src/radeon_cursor.c
>index a45198a..ec80dd8 100644
>--- a/src/radeon_cursor.c
>+++ b/src/radeon_cursor.c
>@@ -71,8 +71,6 @@ static CARD32 mono_cursor_color[] = {
> #define CURSOR_WIDTH	64
> #define CURSOR_HEIGHT	64
> 
>-#define COMMON_CURSOR_SWAPPING_START()	 RADEON_SYNC(info, pScrn)
>-
> /*
>  * The cursor bits are always 32bpp.  On MSBFirst buses,
>  * configure byte swapping to swap 32 bit units when writing
>@@ -84,7 +82,6 @@ static CARD32 mono_cursor_color[] = {
> #define CURSOR_SWAPPING_DECL_MMIO   unsigned char *RADEONMMIO = info->MMIO;
> #define CURSOR_SWAPPING_START() \
>   do { \
>-    COMMON_CURSOR_SWAPPING_START(); \
>     OUTREG(RADEON_SURFACE_CNTL, \
> 	   (info->ModeReg.surface_cntl | \
> 	     RADEON_NONSURF_AP0_SWP_32BPP | RADEON_NONSURF_AP1_SWP_32BPP) & \
>@@ -96,10 +93,7 @@ static CARD32 mono_cursor_color[] = {
> #else
> 
> #define CURSOR_SWAPPING_DECL_MMIO
>-#define CURSOR_SWAPPING_START() \
>-  do { \
>-    COMMON_CURSOR_SWAPPING_START(); \
>-  } while (0)
>+#define CURSOR_SWAPPING_START()
> #define CURSOR_SWAPPING_END()
> 
> #endif
>@@ -205,25 +199,11 @@ static void RADEONLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *image)
>     unsigned char *RADEONMMIO = info->MMIO;
>     CARD8         *s          = (CARD8 *)(pointer)image;
>     CARD32        *d          = (CARD32 *)(pointer)(info->FB + info->cursor_offset + pScrn->fbOffset);
>-    CARD32         save1      = 0;
>-    CARD32         save2      = 0;
>     CARD8	   chunk;
>     CARD32         i, j;
> 
>     RADEONCTRACE(("RADEONLoadCursorImage (at %x)\n", info->cursor_offset));
> 
>-    if (!info->IsSecondary) {
>-	save1 = INREG(RADEON_CRTC_GEN_CNTL) & ~(CARD32) (3 << 20);
>-	save1 |= (CARD32) (2 << 20);
>-	OUTREG(RADEON_CRTC_GEN_CNTL, save1 & (CARD32)~RADEON_CRTC_CUR_EN);
>-    }
>-
>-    if (info->IsSecondary || info->MergedFB) {
>-	save2 = INREG(RADEON_CRTC2_GEN_CNTL) & ~(CARD32) (3 << 20);
>-	save2 |= (CARD32) (2 << 20);
>-	OUTREG(RADEON_CRTC2_GEN_CNTL, save2 & (CARD32)~RADEON_CRTC2_CUR_EN);
>-    }
>-
> #ifdef ARGB_CURSOR
>     info->cursor_argb = FALSE;
> #endif
>@@ -237,23 +217,18 @@ static void RADEONLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *image)
>      * (which actually bit swaps the image) to make the bits LSBFirst
>      */
>     CURSOR_SWAPPING_START();
>+
> #define ARGB_PER_CHUNK	(8 * sizeof (chunk) / 2)
>     for (i = 0; i < (CURSOR_WIDTH * CURSOR_HEIGHT / ARGB_PER_CHUNK); i++) {
>         chunk = *s++;
> 	for (j = 0; j < ARGB_PER_CHUNK; j++, chunk >>= 2)
> 	    *d++ = mono_cursor_color[chunk & 3];
>     }
>+
>     CURSOR_SWAPPING_END();
> 
>     info->cursor_bg = mono_cursor_color[2];
>     info->cursor_fg = mono_cursor_color[3];
>-
>-    if (!info->IsSecondary)
>-	OUTREG(RADEON_CRTC_GEN_CNTL, save1);
>-
>-    if (info->IsSecondary || info->MergedFB)
>-	OUTREG(RADEON_CRTC2_GEN_CNTL, save2);
>-
> }
> 
> /* Hide hardware cursor. */
>@@ -264,6 +239,8 @@ static void RADEONHideCursor(ScrnInfoPtr pScrn)
> 
>     RADEONCTRACE(("RADEONHideCursor\n"));
> 
>+    RADEON_SYNC(info, pScrn);
>+
>     if (info->IsSecondary || info->MergedFB)
> 	OUTREGP(RADEON_CRTC2_GEN_CNTL, 0, ~RADEON_CRTC2_CUR_EN);
> 
>@@ -279,13 +256,15 @@ static void RADEONShowCursor(ScrnInfoPtr pScrn)
> 
>     RADEONCTRACE(("RADEONShowCursor\n"));
> 
>+    RADEON_SYNC(info, pScrn);
>+
>     if (info->IsSecondary || info->MergedFB)
>-	OUTREGP(RADEON_CRTC2_GEN_CNTL, RADEON_CRTC2_CUR_EN,
>-		~RADEON_CRTC2_CUR_EN);
>+	OUTREGP(RADEON_CRTC2_GEN_CNTL, RADEON_CRTC2_CUR_EN | 2 << 20,
>+		~(RADEON_CRTC2_CUR_EN | RADEON_CRTC2_CUR_MODE_MASK));
> 
>     if (!info->IsSecondary)
>-	OUTREGP(RADEON_CRTC_GEN_CNTL, RADEON_CRTC_CUR_EN,
>-		~RADEON_CRTC_CUR_EN);
>+	OUTREGP(RADEON_CRTC_GEN_CNTL, RADEON_CRTC_CUR_EN | 2 << 20,
>+		~(RADEON_CRTC_CUR_EN | RADEON_CRTC_CUR_MODE_MASK));
> }
> 
> /* Determine if hardware cursor is in use. */
>@@ -314,25 +293,11 @@ static void RADEONLoadCursorARGB (ScrnInfoPtr pScrn, CursorPtr pCurs)
>     unsigned char *RADEONMMIO = info->MMIO;
>     CARD32        *d          = (CARD32 *)(pointer)(info->FB + info->cursor_offset + pScrn->fbOffset);
>     int            x, y, w, h;
>-    CARD32         save1      = 0;
>-    CARD32         save2      = 0;
>     CARD32	  *image = pCurs->bits->argb;
>     CARD32	  *i;
> 
>     RADEONCTRACE(("RADEONLoadCursorARGB\n"));
> 
>-    if (!info->IsSecondary) {
>-	save1 = INREG(RADEON_CRTC_GEN_CNTL) & ~(CARD32) (3 << 20);
>-	save1 |= (CARD32) (2 << 20);
>-	OUTREG(RADEON_CRTC_GEN_CNTL, save1 & (CARD32)~RADEON_CRTC_CUR_EN);
>-    }
>-
>-    if (info->IsSecondary || info->MergedFB) {
>-	save2 = INREG(RADEON_CRTC2_GEN_CNTL) & ~(CARD32) (3 << 20);
>-	save2 |= (CARD32) (2 << 20);
>-	OUTREG(RADEON_CRTC2_GEN_CNTL, save2 & (CARD32)~RADEON_CRTC2_CUR_EN);
>-    }
>-
> #ifdef ARGB_CURSOR
>     info->cursor_argb = TRUE;
> #endif
>@@ -361,13 +326,6 @@ static void RADEONLoadCursorARGB (ScrnInfoPtr pScrn, CursorPtr pCurs)
> 	    *d++ = 0;
> 
>     CURSOR_SWAPPING_END ();
>-
>-    if (!info->IsSecondary)
>-	OUTREG(RADEON_CRTC_GEN_CNTL, save1);
>-
>-    if (info->IsSecondary || info->MergedFB)
>-	OUTREG(RADEON_CRTC2_GEN_CNTL, save2);
>-
> }
> 
> #endif
>diff --git a/src/radeon_reg.h b/src/radeon_reg.h
>index 0d351b3..46ade8e 100644
>--- a/src/radeon_reg.h
>+++ b/src/radeon_reg.h
>@@ -308,7 +308,7 @@
> #       define RADEON_CRTC_CSYNC_EN         (1 <<  4)
> #       define RADEON_CRTC_ICON_EN          (1 << 15)
> #       define RADEON_CRTC_CUR_EN           (1 << 16)
>-#       define RADEON_CRTC_CUR_MODE_MASK    (7 << 17)
>+#       define RADEON_CRTC_CUR_MODE_MASK    (7 << 20)
> #       define RADEON_CRTC_EXT_DISP_EN      (1 << 24)
> #       define RADEON_CRTC_EN               (1 << 25)
> #       define RADEON_CRTC_DISP_REQ_EN_B    (1 << 26)

Actions: View | Splinter Review

Attachments on bug 10815: 9807 | 9808 | 9994

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.