diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2002-08-26 20:02:26 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2002-08-26 20:02:26 +0000 |
| commit | c3d2e90cc79c1b942e184c2dfb708965b38bb344 (patch) | |
| tree | 846393b13f57e987a9085302901e7568e731a1a4 /shared-core/radeon_drv.h | |
| parent | c9d387a04851a543dcb0e683dd17006752a07fc3 (diff) | |
merged trunk into branchr200-0-1-20020822r200-0-1-branch
Diffstat (limited to 'shared-core/radeon_drv.h')
| -rw-r--r-- | shared-core/radeon_drv.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/shared-core/radeon_drv.h b/shared-core/radeon_drv.h index 57cd5f4f..7c341b39 100644 --- a/shared-core/radeon_drv.h +++ b/shared-core/radeon_drv.h @@ -76,6 +76,7 @@ typedef struct drm_radeon_private { drm_radeon_freelist_t *tail; int last_buf; volatile u32 *scratch; + int writeback_works; int usec_timeout; @@ -233,6 +234,10 @@ extern int radeon_cp_flip( DRM_IOCTL_ARGS ); #define RADEON_SCRATCH_UMSK 0x0770 #define RADEON_SCRATCH_ADDR 0x0774 +#define GET_SCRATCH( x ) (dev_priv->writeback_works \ + ? DRM_READ32( &dev_priv->scratch[(x)] ) \ + : RADEON_READ( RADEON_SCRATCH_REG0 + 4*(x) ) ) + #define RADEON_HOST_PATH_CNTL 0x0130 # define RADEON_HDP_SOFT_RESET (1 << 26) # define RADEON_HDP_WC_TIMEOUT_MASK (7 << 28) |