Attachment 2230 Details for Bug 2844 – Patch, Take Two

[patch] Patch, Take Two

radeon-cursor-sync.diff (text/plain), 1.50 KB, created by Michel Dänzer on 2005-03-28 22:05:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2005-03-28 22:05:53 UTC

Size: 1.50 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.5
>diff -p -u -r1.5 radeon_cursor.c
>--- programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c	24 Mar 2005 06:45:51 -0000	1.5
>+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c	29 Mar 2005 06:04:23 -0000
>@@ -64,6 +64,10 @@ static CARD32 mono_cursor_color[] = {
> #define CURSOR_WIDTH	64
> #define CURSOR_HEIGHT	64
> 
>+#define COMMON_CURSOR_SWAPPING_START()	  \
>+    if (info->accel && info->accel->Sync) \
>+	info->accel->Sync(pScrn);
>+
> /*
>  * The cursor bits are always 32bpp.  On MSBFirst buses,
>  * configure byte swapping to swap 32 bit units when writing
>@@ -74,17 +78,23 @@ static CARD32 mono_cursor_color[] = {
> 
> #define CURSOR_SWAPPING_DECL_MMIO   unsigned char *RADEONMMIO = info->MMIO;
> #define CURSOR_SWAPPING_START() \
>+  do { \
>     OUTREG(RADEON_SURFACE_CNTL, \
> 	   (info->ModeReg.surface_cntl | \
> 	    RADEON_NONSURF_AP0_SWP_32BPP) & \
>-	   ~RADEON_NONSURF_AP0_SWP_16BPP)
>+	   ~RADEON_NONSURF_AP0_SWP_16BPP); \
>+    COMMON_CURSOR_SWAPPING_START(); \
>+  } while (0)
> #define CURSOR_SWAPPING_END()	(OUTREG(RADEON_SURFACE_CNTL, \
> 					info->ModeReg.surface_cntl))
> 
> #else
> 
> #define CURSOR_SWAPPING_DECL_MMIO
>-#define CURSOR_SWAPPING_START()
>+#define CURSOR_SWAPPING_START() \
>+  do { \
>+    COMMON_CURSOR_SWAPPING_START(); \
>+  } while (0)
> #define CURSOR_SWAPPING_END()
> 
> #endif

Flags:

michel: 6.8-branch?

Actions: View | Splinter Review

Attachments on bug 2844: 2229 | 2230

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.