diff options
| author | Dave Airlie <airlied@redhat.com> | 2007-11-22 17:17:06 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-11-22 17:17:06 +1100 |
| commit | a20587e3950f849deb1e723a0b4455a19f7b3fb8 (patch) | |
| tree | de0a9d0b6558f3b359acf7985ddf4b8e7e83ee24 /shared-core/radeon_drv.h | |
| parent | 8fd8bf599b42b6caa062afabdfce7385d59a7695 (diff) | |
| parent | 5dc5c36e624e5393b5427a159ad34e5fc358cc9f (diff) | |
Merge branch 'origin' into modesetting-101
Conflicts:
linux-core/drmP.h
shared-core/i915_dma.c
shared-core/i915_drm.h
shared-core/radeon_drv.h
Diffstat (limited to 'shared-core/radeon_drv.h')
| -rw-r--r-- | shared-core/radeon_drv.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/shared-core/radeon_drv.h b/shared-core/radeon_drv.h index 5332a386..37b9c43f 100644 --- a/shared-core/radeon_drv.h +++ b/shared-core/radeon_drv.h @@ -297,11 +297,11 @@ typedef struct drm_radeon_private { int irq_enabled; struct radeon_surface surfaces[RADEON_MAX_SURFACES]; - struct radeon_virt_surface virt_surfaces[2*RADEON_MAX_SURFACES]; + struct radeon_virt_surface virt_surfaces[2 * RADEON_MAX_SURFACES]; unsigned long pcigart_offset; unsigned int pcigart_offset_set; - struct ati_pcigart_info gart_info; + struct drm_ati_pcigart_info gart_info; u32 scratch_ages[5]; @@ -352,6 +352,7 @@ extern int radeon_engine_reset(struct drm_device *dev, void *data, struct drm_fi extern int radeon_fullscreen(struct drm_device *dev, void *data, struct drm_file *file_priv); extern int radeon_cp_buffers(struct drm_device *dev, void *data, struct drm_file *file_priv); extern void radeon_gart_flush(struct drm_device *dev); +extern u32 radeon_read_fb_location(drm_radeon_private_t *dev_priv); extern void radeon_freelist_reset(struct drm_device * dev); extern struct drm_buf *radeon_freelist_get(struct drm_device * dev); @@ -402,7 +403,7 @@ extern void r300_init_reg_flags(void); extern int r300_do_cp_cmdbuf(struct drm_device *dev, struct drm_file *file_priv, - drm_radeon_kcmd_buffer_t* cmdbuf); + drm_radeon_kcmd_buffer_t *cmdbuf); #ifdef RADEON_HAVE_FENCE |