]>
Commit | Line | Data |
---|---|---|
de98c86e | 1 | --- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c.radeon-cursor-sync-fdo2844-2230 2004-08-04 09:17:31.000000000 -0400 |
2 | +++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c 2005-04-12 00:32:01.000000000 -0400 | |
3 | @@ -64,6 +64,10 @@ | |
4 | #define CURSOR_WIDTH 64 | |
5 | #define CURSOR_HEIGHT 64 | |
6 | ||
7 | +#define COMMON_CURSOR_SWAPPING_START() \ | |
8 | + if (info->accel && info->accel->Sync) \ | |
9 | + info->accel->Sync(pScrn); | |
10 | + | |
11 | /* | |
12 | * The cursor bits are always 32bpp. On MSBFirst buses, | |
13 | * configure byte swapping to swap 32 bit units when writing | |
14 | @@ -74,17 +78,23 @@ | |
15 | ||
16 | #define CURSOR_SWAPPING_DECL_MMIO unsigned char *RADEONMMIO = info->MMIO; | |
17 | #define CURSOR_SWAPPING_START() \ | |
18 | + do { \ | |
19 | OUTREG(RADEON_SURFACE_CNTL, \ | |
20 | (info->ModeReg.surface_cntl | \ | |
21 | RADEON_NONSURF_AP0_SWP_32BPP) & \ | |
22 | - ~RADEON_NONSURF_AP0_SWP_16BPP) | |
23 | + ~RADEON_NONSURF_AP0_SWP_16BPP); \ | |
24 | + COMMON_CURSOR_SWAPPING_START(); \ | |
25 | + } while (0) | |
26 | #define CURSOR_SWAPPING_END() (OUTREG(RADEON_SURFACE_CNTL, \ | |
27 | info->ModeReg.surface_cntl)) | |
28 | ||
29 | #else | |
30 | ||
31 | #define CURSOR_SWAPPING_DECL_MMIO | |
32 | -#define CURSOR_SWAPPING_START() | |
33 | +#define CURSOR_SWAPPING_START() \ | |
34 | + do { \ | |
35 | + COMMON_CURSOR_SWAPPING_START(); \ | |
36 | + } while (0) | |
37 | #define CURSOR_SWAPPING_END() | |
38 | ||
39 | #endif |