diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-13 07:56:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-13 07:56:44 -0400 |
| commit | 73909f7a665991013dcff42a815fda76d3a7300a (patch) | |
| tree | 84bb9899e2204bf6af6fd4f249bb909c2a89faf8 /include/video/radeon.h | |
| parent | d6672c501852d577097f6757c311d937aca0b04b (diff) | |
| parent | 30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff) | |
Merge commit 'v2.6.27-rc3' into core/urgent
Diffstat (limited to 'include/video/radeon.h')
| -rw-r--r-- | include/video/radeon.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/video/radeon.h b/include/video/radeon.h index 95a1f2038b1d..099ffa5e5bee 100644 --- a/include/video/radeon.h +++ b/include/video/radeon.h | |||
| @@ -742,6 +742,10 @@ | |||
| 742 | #define SOFT_RESET_RB (1 << 6) | 742 | #define SOFT_RESET_RB (1 << 6) |
| 743 | #define SOFT_RESET_HDP (1 << 7) | 743 | #define SOFT_RESET_HDP (1 << 7) |
| 744 | 744 | ||
| 745 | /* WAIT_UNTIL bit constants */ | ||
| 746 | #define WAIT_DMA_GUI_IDLE (1 << 9) | ||
| 747 | #define WAIT_2D_IDLECLEAN (1 << 16) | ||
| 748 | |||
| 745 | /* SURFACE_CNTL bit consants */ | 749 | /* SURFACE_CNTL bit consants */ |
| 746 | #define SURF_TRANSLATION_DIS (1 << 8) | 750 | #define SURF_TRANSLATION_DIS (1 << 8) |
| 747 | #define NONSURF_AP0_SWP_16BPP (1 << 20) | 751 | #define NONSURF_AP0_SWP_16BPP (1 << 20) |