Merge branch 'drm-radeon-testing' of /ssd/git/drm-radeon-next into drm-next-stage

* 'drm-radeon-testing' of /ssd/git/drm-radeon-next:
  drm/radeon: r100/r200 ums: block ability for userspace app to trash 0 page and beyond
  drm/ttm: fix function prototype to match implementation
  drm/radeon: use ALIGN instead of open coding it
  drm/radeon/kms: initialize set_surface_reg reg for rs600 asic
This commit is contained in:
Dave Airlie
2010-03-01 16:08:57 +10:00
7 changed files with 15 additions and 4 deletions

View File

@@ -268,6 +268,8 @@ typedef struct drm_radeon_private {
u32 scratch_ages[5];
int have_z_offset;
/* starting from here on, data is preserved accross an open */
uint32_t flags; /* see radeon_chip_flags */
resource_size_t fb_aper_offset;