diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/gpu/drm/radeon/avivod.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/gpu/drm/radeon/avivod.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/avivod.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/avivod.h b/drivers/gpu/drm/radeon/avivod.h index d4e6e6e4a938..3c391e7e9fd4 100644 --- a/drivers/gpu/drm/radeon/avivod.h +++ b/drivers/gpu/drm/radeon/avivod.h | |||
| @@ -30,11 +30,13 @@ | |||
| 30 | 30 | ||
| 31 | #define D1CRTC_CONTROL 0x6080 | 31 | #define D1CRTC_CONTROL 0x6080 |
| 32 | #define CRTC_EN (1 << 0) | 32 | #define CRTC_EN (1 << 0) |
| 33 | #define D1CRTC_STATUS 0x609c | ||
| 33 | #define D1CRTC_UPDATE_LOCK 0x60E8 | 34 | #define D1CRTC_UPDATE_LOCK 0x60E8 |
| 34 | #define D1GRPH_PRIMARY_SURFACE_ADDRESS 0x6110 | 35 | #define D1GRPH_PRIMARY_SURFACE_ADDRESS 0x6110 |
| 35 | #define D1GRPH_SECONDARY_SURFACE_ADDRESS 0x6118 | 36 | #define D1GRPH_SECONDARY_SURFACE_ADDRESS 0x6118 |
| 36 | 37 | ||
| 37 | #define D2CRTC_CONTROL 0x6880 | 38 | #define D2CRTC_CONTROL 0x6880 |
| 39 | #define D2CRTC_STATUS 0x689c | ||
| 38 | #define D2CRTC_UPDATE_LOCK 0x68E8 | 40 | #define D2CRTC_UPDATE_LOCK 0x68E8 |
| 39 | #define D2GRPH_PRIMARY_SURFACE_ADDRESS 0x6910 | 41 | #define D2GRPH_PRIMARY_SURFACE_ADDRESS 0x6910 |
| 40 | #define D2GRPH_SECONDARY_SURFACE_ADDRESS 0x6918 | 42 | #define D2GRPH_SECONDARY_SURFACE_ADDRESS 0x6918 |