diff options
author | Dave Airlie <airlied@redhat.com> | 2009-09-07 06:27:20 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-09-07 06:27:20 -0400 |
commit | 11670d3c93210793562748d83502ecbef4034765 (patch) | |
tree | 9e2c33c6249e26b05a2b5db87d4f4840e9049840 /drivers/gpu/drm/radeon/radeon_drv.h | |
parent | 575dc34ee0de867ba83abf25998e0963bff451fa (diff) | |
parent | 01dfba93d9dfcf6d7abfc55ff5d9d6e76fa01ba0 (diff) |
Merge intel drm-intel-next branch
Merge remote branch 'anholt/drm-intel-next' of ../anholt-2.6 into drm-next
Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_sdvo.c
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 45a6ad997f5f..40294a07976f 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.h +++ b/drivers/gpu/drm/radeon/radeon_drv.h | |||
@@ -103,9 +103,10 @@ | |||
103 | * 1.28- Add support for VBL on CRTC2 | 103 | * 1.28- Add support for VBL on CRTC2 |
104 | * 1.29- R500 3D cmd buffer support | 104 | * 1.29- R500 3D cmd buffer support |
105 | * 1.30- Add support for occlusion queries | 105 | * 1.30- Add support for occlusion queries |
106 | * 1.31- Add support for num Z pipes from GET_PARAM | ||
106 | */ | 107 | */ |
107 | #define DRIVER_MAJOR 1 | 108 | #define DRIVER_MAJOR 1 |
108 | #define DRIVER_MINOR 30 | 109 | #define DRIVER_MINOR 31 |
109 | #define DRIVER_PATCHLEVEL 0 | 110 | #define DRIVER_PATCHLEVEL 0 |
110 | 111 | ||
111 | /* | 112 | /* |
@@ -332,6 +333,7 @@ typedef struct drm_radeon_private { | |||
332 | resource_size_t fb_aper_offset; | 333 | resource_size_t fb_aper_offset; |
333 | 334 | ||
334 | int num_gb_pipes; | 335 | int num_gb_pipes; |
336 | int num_z_pipes; | ||
335 | int track_flush; | 337 | int track_flush; |
336 | drm_local_map_t *mmio; | 338 | drm_local_map_t *mmio; |
337 | 339 | ||
@@ -694,6 +696,7 @@ extern void r600_page_table_cleanup(struct drm_device *dev, struct drm_ati_pciga | |||
694 | 696 | ||
695 | /* pipe config regs */ | 697 | /* pipe config regs */ |
696 | #define R400_GB_PIPE_SELECT 0x402c | 698 | #define R400_GB_PIPE_SELECT 0x402c |
699 | #define RV530_GB_PIPE_SELECT2 0x4124 | ||
697 | #define R500_DYN_SCLK_PWMEM_PIPE 0x000d /* PLL */ | 700 | #define R500_DYN_SCLK_PWMEM_PIPE 0x000d /* PLL */ |
698 | #define R300_GB_TILE_CONFIG 0x4018 | 701 | #define R300_GB_TILE_CONFIG 0x4018 |
699 | # define R300_ENABLE_TILING (1 << 0) | 702 | # define R300_ENABLE_TILING (1 << 0) |