Rev 1221 | Rev 1321 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1221 | Rev 1268 | ||
|---|---|---|---|
| Line 382... | Line 382... | ||
| 382 | 382 | ||
| 383 | # define AVIVO_D1GRPH_SWAP_RB (1 << 16) |
383 | # define AVIVO_D1GRPH_SWAP_RB (1 << 16) |
| 384 | # define AVIVO_D1GRPH_TILED (1 << 20) |
384 | # define AVIVO_D1GRPH_TILED (1 << 20) |
| Line -... | Line 385... | ||
| - | 385 | # define AVIVO_D1GRPH_MACRO_ADDRESS_MODE (1 << 21) |
|
| - | 386 | ||
| - | 387 | /* The R7xx *_HIGH surface regs are backwards; the D1 regs are in the D2 |
|
| 385 | # define AVIVO_D1GRPH_MACRO_ADDRESS_MODE (1 << 21) |
388 | * block and vice versa. This applies to GRPH, CUR, etc. |
| 386 | 389 | */ |
|
| - | 390 | #define AVIVO_D1GRPH_LUT_SEL 0x6108 |
|
| - | 391 | #define AVIVO_D1GRPH_PRIMARY_SURFACE_ADDRESS 0x6110 |
|
| 387 | #define AVIVO_D1GRPH_LUT_SEL 0x6108 |
392 | #define R700_D1GRPH_PRIMARY_SURFACE_ADDRESS_HIGH 0x6914 |
| - | 393 | #define R700_D2GRPH_PRIMARY_SURFACE_ADDRESS_HIGH 0x6114 |
|
| - | 394 | #define AVIVO_D1GRPH_SECONDARY_SURFACE_ADDRESS 0x6118 |
|
| 388 | #define AVIVO_D1GRPH_PRIMARY_SURFACE_ADDRESS 0x6110 |
395 | #define R700_D1GRPH_SECONDARY_SURFACE_ADDRESS_HIGH 0x691c |
| 389 | #define AVIVO_D1GRPH_SECONDARY_SURFACE_ADDRESS 0x6118 |
396 | #define R700_D2GRPH_SECONDARY_SURFACE_ADDRESS_HIGH 0x611c |
| 390 | #define AVIVO_D1GRPH_PITCH 0x6120 |
397 | #define AVIVO_D1GRPH_PITCH 0x6120 |
| 391 | #define AVIVO_D1GRPH_SURFACE_OFFSET_X 0x6124 |
398 | #define AVIVO_D1GRPH_SURFACE_OFFSET_X 0x6124 |
| 392 | #define AVIVO_D1GRPH_SURFACE_OFFSET_Y 0x6128 |
399 | #define AVIVO_D1GRPH_SURFACE_OFFSET_Y 0x6128 |
| Line 402... | Line 409... | ||
| 402 | # define AVIVO_D1CURSOR_EN (1 << 0) |
409 | # define AVIVO_D1CURSOR_EN (1 << 0) |
| 403 | # define AVIVO_D1CURSOR_MODE_SHIFT 8 |
410 | # define AVIVO_D1CURSOR_MODE_SHIFT 8 |
| 404 | # define AVIVO_D1CURSOR_MODE_MASK (3 << 8) |
411 | # define AVIVO_D1CURSOR_MODE_MASK (3 << 8) |
| 405 | # define AVIVO_D1CURSOR_MODE_24BPP 2 |
412 | # define AVIVO_D1CURSOR_MODE_24BPP 2 |
| 406 | #define AVIVO_D1CUR_SURFACE_ADDRESS 0x6408 |
413 | #define AVIVO_D1CUR_SURFACE_ADDRESS 0x6408 |
| - | 414 | #define R700_D1CUR_SURFACE_ADDRESS_HIGH 0x6c0c |
|
| - | 415 | #define R700_D2CUR_SURFACE_ADDRESS_HIGH 0x640c |
|
| 407 | #define AVIVO_D1CUR_SIZE 0x6410 |
416 | #define AVIVO_D1CUR_SIZE 0x6410 |
| 408 | #define AVIVO_D1CUR_POSITION 0x6414 |
417 | #define AVIVO_D1CUR_POSITION 0x6414 |
| 409 | #define AVIVO_D1CUR_HOT_SPOT 0x6418 |
418 | #define AVIVO_D1CUR_HOT_SPOT 0x6418 |
| 410 | #define AVIVO_D1CUR_UPDATE 0x6424 |
419 | #define AVIVO_D1CUR_UPDATE 0x6424 |
| 411 | # define AVIVO_D1CURSOR_UPDATE_LOCK (1 << 16) |
420 | # define AVIVO_D1CURSOR_UPDATE_LOCK (1 << 16) |