aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/radeon_drv.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/drm/radeon_drv.h')
-rw-r--r--drivers/char/drm/radeon_drv.h23
1 files changed, 23 insertions, 0 deletions
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h
index 5e6f4612adba..c3615cf20b85 100644
--- a/drivers/char/drm/radeon_drv.h
+++ b/drivers/char/drm/radeon_drv.h
@@ -307,6 +307,8 @@ typedef struct drm_radeon_private {
307 /* starting from here on, data is preserved accross an open */ 307 /* starting from here on, data is preserved accross an open */
308 uint32_t flags; /* see radeon_chip_flags */ 308 uint32_t flags; /* see radeon_chip_flags */
309 unsigned long fb_aper_offset; 309 unsigned long fb_aper_offset;
310
311 int num_gb_pipes;
310} drm_radeon_private_t; 312} drm_radeon_private_t;
311 313
312typedef struct drm_radeon_buf_priv { 314typedef struct drm_radeon_buf_priv {
@@ -529,6 +531,27 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
529#define RS480_AGP_BASE_2 0x0164 531#define RS480_AGP_BASE_2 0x0164
530#define RADEON_AGP_BASE 0x0170 532#define RADEON_AGP_BASE 0x0170
531 533
534/* pipe config regs */
535#define R400_GB_PIPE_SELECT 0x402c
536#define R500_DYN_SCLK_PWMEM_PIPE 0x000d /* PLL */
537#define R500_SU_REG_DEST 0x42c8
538#define R300_GB_TILE_CONFIG 0x4018
539# define R300_ENABLE_TILING (1 << 0)
540# define R300_PIPE_COUNT_RV350 (0 << 1)
541# define R300_PIPE_COUNT_R300 (3 << 1)
542# define R300_PIPE_COUNT_R420_3P (6 << 1)
543# define R300_PIPE_COUNT_R420 (7 << 1)
544# define R300_TILE_SIZE_8 (0 << 4)
545# define R300_TILE_SIZE_16 (1 << 4)
546# define R300_TILE_SIZE_32 (2 << 4)
547# define R300_SUBPIXEL_1_12 (0 << 16)
548# define R300_SUBPIXEL_1_16 (1 << 16)
549#define R300_DST_PIPE_CONFIG 0x170c
550# define R300_PIPE_AUTO_CONFIG (1 << 31)
551#define R300_RB2D_DSTCACHE_MODE 0x3428
552# define R300_DC_AUTOFLUSH_ENABLE (1 << 8)
553# define R300_DC_DC_DISABLE_IGNORE_PE (1 << 17)
554
532#define RADEON_RB3D_COLOROFFSET 0x1c40 555#define RADEON_RB3D_COLOROFFSET 0x1c40
533#define RADEON_RB3D_COLORPITCH 0x1c48 556#define RADEON_RB3D_COLORPITCH 0x1c48
534 557