diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-03-01 16:08:57 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-03-01 16:08:57 +1000 |
| commit | 68de7745822f0dc2eea940e3c1fc65896d7afc88 (patch) | |
| tree | 8ee06f4ee466b58fc224a7d447dd90a1168896e0 /drivers/gpu/drm/radeon/radeon_drv.h | |
| parent | cf7934a2a0ec55759fcf6861a868baadfd522300 (diff) | |
| parent | 566d84d172161cb6c0c4dd834c34abbac6bf7b38 (diff) | |
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
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_drv.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_drv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h index 88f4d8669d8..cf911859eac 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.h +++ b/drivers/gpu/drm/radeon/radeon_drv.h @@ -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; |