diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2009-02-24 14:02:13 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-03-13 00:24:10 -0400 |
commit | befb73c2322923766df7e36b51f407dbdc047eab (patch) | |
tree | de14b3d98afba01aab45b4cfa531b14c34905f82 /include/drm/radeon_drm.h | |
parent | 995e37cafb90f104395e015a9836cc459df1fc39 (diff) |
drm/radeon: prep for r6xx/r7xx support
- add r6xx/r7xx regs and macros
- add r6xx/r7xx chip families
- fix register access for regs with offsets >= 0x10000
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm/radeon_drm.h')
-rw-r--r-- | include/drm/radeon_drm.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h index 73ff51f1231..937a275cbb9 100644 --- a/include/drm/radeon_drm.h +++ b/include/drm/radeon_drm.h | |||
@@ -304,6 +304,8 @@ typedef union { | |||
304 | 304 | ||
305 | #define RADEON_SCRATCH_REG_OFFSET 32 | 305 | #define RADEON_SCRATCH_REG_OFFSET 32 |
306 | 306 | ||
307 | #define R600_SCRATCH_REG_OFFSET 256 | ||
308 | |||
307 | #define RADEON_NR_SAREA_CLIPRECTS 12 | 309 | #define RADEON_NR_SAREA_CLIPRECTS 12 |
308 | 310 | ||
309 | /* There are 2 heaps (local/GART). Each region within a heap is a | 311 | /* There are 2 heaps (local/GART). Each region within a heap is a |
@@ -526,7 +528,8 @@ typedef struct drm_radeon_init { | |||
526 | RADEON_INIT_CP = 0x01, | 528 | RADEON_INIT_CP = 0x01, |
527 | RADEON_CLEANUP_CP = 0x02, | 529 | RADEON_CLEANUP_CP = 0x02, |
528 | RADEON_INIT_R200_CP = 0x03, | 530 | RADEON_INIT_R200_CP = 0x03, |
529 | RADEON_INIT_R300_CP = 0x04 | 531 | RADEON_INIT_R300_CP = 0x04, |
532 | RADEON_INIT_R600_CP = 0x05 | ||
530 | } func; | 533 | } func; |
531 | unsigned long sarea_priv_offset; | 534 | unsigned long sarea_priv_offset; |
532 | int is_pci; | 535 | int is_pci; |