diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2009-08-19 19:11:39 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-08-21 19:10:30 +1000 |
commit | f779b3e513478218cbaaaa0a506d7801cab6fd14 (patch) | |
tree | 977258791900e68ed2fbcd78d631c22f4185e48a /drivers/gpu/drm/radeon/radeon_drv.h | |
parent | 17782d99502851dc7e48114ee9c5a6d6741cba18 (diff) | |
download | kernel_samsung_espresso10-f779b3e513478218cbaaaa0a506d7801cab6fd14.zip kernel_samsung_espresso10-f779b3e513478218cbaaaa0a506d7801cab6fd14.tar.gz kernel_samsung_espresso10-f779b3e513478218cbaaaa0a506d7801cab6fd14.tar.bz2 |
drm/radeon: add GET_PARAM/INFO support for Z pipes
Needed for occlusion queries on rv530 chips.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_drv.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_drv.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h index 3933f82..6fa32da 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.h +++ b/drivers/gpu/drm/radeon/radeon_drv.h @@ -100,9 +100,10 @@ * 1.28- Add support for VBL on CRTC2 * 1.29- R500 3D cmd buffer support * 1.30- Add support for occlusion queries + * 1.31- Add support for num Z pipes from GET_PARAM */ #define DRIVER_MAJOR 1 -#define DRIVER_MINOR 30 +#define DRIVER_MINOR 31 #define DRIVER_PATCHLEVEL 0 /* @@ -329,6 +330,7 @@ typedef struct drm_radeon_private { resource_size_t fb_aper_offset; int num_gb_pipes; + int num_z_pipes; int track_flush; drm_local_map_t *mmio; @@ -689,6 +691,7 @@ extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pciga /* pipe config regs */ #define R400_GB_PIPE_SELECT 0x402c +#define RV530_GB_PIPE_SELECT2 0x4124 #define R500_DYN_SCLK_PWMEM_PIPE 0x000d /* PLL */ #define R300_GB_TILE_CONFIG 0x4018 # define R300_ENABLE_TILING (1 << 0) |