diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-04-29 01:05:31 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-05-08 12:08:30 -0400 |
| commit | 666b0ff9f7fd216f7c31315b284c4bf389a51007 (patch) | |
| tree | a0325b49e24f7e005d23846f1cf54c90cb4326da | |
| parent | 998fd24417d1e86ad70e15a2f55bb81320b28987 (diff) | |
R6xx/r7xx: fix CURSOR_SWAPPING_* macros
r6xx/r7xx have different swapper regs
| -rw-r--r-- | src/radeon_cursor.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/radeon_cursor.c b/src/radeon_cursor.c index ae9c3469..ba2d6aec 100644 --- a/src/radeon_cursor.c +++ b/src/radeon_cursor.c @@ -73,14 +73,17 @@ #define CURSOR_SWAPPING_DECL_MMIO unsigned char *RADEONMMIO = info->MMIO; #define CURSOR_SWAPPING_START() \ do { \ + if (info->ChipFamily < CHIP_FAMILY_R600) \ OUTREG(RADEON_SURFACE_CNTL, \ (info->ModeReg->surface_cntl | \ RADEON_NONSURF_AP0_SWP_32BPP | RADEON_NONSURF_AP1_SWP_32BPP) & \ ~(RADEON_NONSURF_AP0_SWP_16BPP | RADEON_NONSURF_AP1_SWP_16BPP)); \ } while (0) -#define CURSOR_SWAPPING_END() (OUTREG(RADEON_SURFACE_CNTL, \ - info->ModeReg->surface_cntl)) - +#define CURSOR_SWAPPING_END() \ + do { \ + if (info->ChipFamily < CHIP_FAMILY_R600) \ + OUTREG(RADEON_SURFACE_CNTL, info->ModeReg->surface_cntl); \ + } while (0) #else #define CURSOR_SWAPPING_DECL_MMIO |