diff options
| author | Nian Wu <nian.wu@intel.com> | 2007-03-05 09:01:45 -0500 |
|---|---|---|
| committer | Nian Wu <nian.wu@intel.com> | 2007-03-05 09:01:45 -0500 |
| commit | 0a85c9fa02608426a9a97f1d26e37c301330926b (patch) | |
| tree | f2280f5188b4e657e93654fbbf63ca5dec28599f /shared-core/radeon_drv.h | |
| parent | 6c48b8e7ffd0af4d49855d7175e822f4af1f526f (diff) | |
| parent | 188a93c9dfde31de4d86733fa46b50487d3a4ac0 (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Diffstat (limited to 'shared-core/radeon_drv.h')
| -rw-r--r-- | shared-core/radeon_drv.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/shared-core/radeon_drv.h b/shared-core/radeon_drv.h index 5c426fe0..3e56af30 100644 --- a/shared-core/radeon_drv.h +++ b/shared-core/radeon_drv.h @@ -95,10 +95,11 @@ * 1.24- Add general-purpose packet for manipulating scratch registers (r300) * 1.25- Add support for r200 vertex programs (R200_EMIT_VAP_PVS_CNTL, * new packet type) + * 1.26- Add support for variable size PCI(E) gart aperture */ #define DRIVER_MAJOR 1 -#define DRIVER_MINOR 25 +#define DRIVER_MINOR 26 #define DRIVER_PATCHLEVEL 0 /* @@ -282,6 +283,7 @@ typedef struct drm_radeon_private { struct radeon_virt_surface virt_surfaces[2*RADEON_MAX_SURFACES]; unsigned long pcigart_offset; + unsigned int pcigart_offset_set; drm_ati_pcigart_info gart_info; u32 scratch_ages[5]; |