summaryrefslogtreecommitdiff
path: root/src/radeon_macros.h
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2009-03-13 17:51:56 -0400
committerAlex Deucher <alexdeucher@gmail.com>2009-03-13 17:58:06 -0400
commit1db81afe4f8db55e02a65cd22ad84c6bbb27e8ef (patch)
tree7df77b815947f7fb6b276e50257abb7346ebbc92 /src/radeon_macros.h
parent5bb326c64ad3bf5c93943280dcbcb25c8910d1aa (diff)
radeon: add support for 30 bit LUTs
All radeons have them. Thanks to Yang Zhao for figuring this out.
Diffstat (limited to 'src/radeon_macros.h')
-rw-r--r--src/radeon_macros.h13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/radeon_macros.h b/src/radeon_macros.h
index f19bc3e7..387e5f5f 100644
--- a/src/radeon_macros.h
+++ b/src/radeon_macros.h
@@ -102,17 +102,12 @@ do { \
#define OUTPAL_NEXT(r, g, b) \
do { \
if (IS_AVIVO_VARIANT) { \
- OUTREG(AVIVO_DC_LUT_30_COLOR, ((r) << 22) | ((g) << 12) | ((b) << 2)); \
- } else { \
- OUTREG(RADEON_PALETTE_DATA, ((r) << 16) | ((g) << 8) | (b)); \
+ OUTREG(AVIVO_DC_LUT_30_COLOR, ((r) << 20) | ((g) << 10) | (b)); \
+ } else { \
+ OUTREG(RADEON_PALETTE_30_DATA, ((r) << 20) | ((g) << 10) | (b)); \
} \
} while (0)
-#define OUTPAL_NEXT_uint32_t(v) \
-do { \
- OUTREG(RADEON_PALETTE_DATA, (v & 0x00ffffff)); \
-} while (0)
-
#define OUTPAL(idx, r, g, b) \
do { \
OUTPAL_START((idx)); \
@@ -133,7 +128,7 @@ do { \
if (IS_AVIVO_VARIANT) { \
INREG(AVIVO_DC_LUT_30_COLOR); \
} else { \
- INREG(RADEON_PALETTE_DATA); \
+ INREG(RADEON_PALETTE_30_DATA); \
} \
} while (0)