diff options
Diffstat (limited to 'linux-core/radeon_buffer.c')
| -rw-r--r-- | linux-core/radeon_buffer.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c index 3afc17ee..8e2b20b1 100644 --- a/linux-core/radeon_buffer.c +++ b/linux-core/radeon_buffer.c @@ -33,7 +33,7 @@ #include "radeon_drm.h" #include "radeon_drv.h" -drm_ttm_backend_t *radeon_create_ttm_backend_entry(drm_device_t * dev) +struct drm_ttm_backend *radeon_create_ttm_backend_entry(struct drm_device * dev) { drm_radeon_private_t *dev_priv = dev->dev_private; @@ -43,7 +43,7 @@ drm_ttm_backend_t *radeon_create_ttm_backend_entry(drm_device_t * dev) return ati_pcigart_init_ttm(dev, &dev_priv->gart_info, radeon_gart_flush); } -int radeon_fence_types(drm_buffer_object_t *bo, uint32_t * class, uint32_t * type) +int radeon_fence_types(struct drm_buffer_object *bo, uint32_t * class, uint32_t * type) { *class = 0; if (bo->mem.flags & (DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE)) @@ -53,7 +53,7 @@ int radeon_fence_types(drm_buffer_object_t *bo, uint32_t * class, uint32_t * typ return 0; } -int radeon_invalidate_caches(drm_device_t * dev, uint32_t flags) +int radeon_invalidate_caches(struct drm_device * dev, uint64_t flags) { drm_radeon_private_t *dev_priv = dev->dev_private; RING_LOCALS; @@ -65,7 +65,7 @@ int radeon_invalidate_caches(drm_device_t * dev, uint32_t flags) return 0; } -uint32_t radeon_evict_mask(drm_buffer_object_t *bo) +uint32_t radeon_evict_mask(struct drm_buffer_object *bo) { switch (bo->mem.mem_type) { case DRM_BO_MEM_LOCAL: @@ -81,8 +81,8 @@ uint32_t radeon_evict_mask(drm_buffer_object_t *bo) } } -int radeon_init_mem_type(drm_device_t * dev, uint32_t type, - drm_mem_type_manager_t * man) +int radeon_init_mem_type(struct drm_device * dev, uint32_t type, + struct drm_mem_type_manager * man) { drm_radeon_private_t *dev_priv = dev->dev_private; @@ -127,7 +127,7 @@ int radeon_init_mem_type(drm_device_t * dev, uint32_t type, return 0; } -static void radeon_emit_copy_blit(drm_device_t * dev, +static void radeon_emit_copy_blit(struct drm_device * dev, uint32_t src_offset, uint32_t dst_offset, uint32_t pages, int direction) @@ -183,10 +183,10 @@ static void radeon_emit_copy_blit(drm_device_t * dev, return; } -static int radeon_move_blit(drm_buffer_object_t * bo, - int evict, int no_wait, drm_bo_mem_reg_t *new_mem) +static int radeon_move_blit(struct drm_buffer_object * bo, + int evict, int no_wait, struct drm_bo_mem_reg *new_mem) { - drm_bo_mem_reg_t *old_mem = &bo->mem; + struct drm_bo_mem_reg *old_mem = &bo->mem; int dir = 0; if ((old_mem->mem_type == new_mem->mem_type) && @@ -207,11 +207,11 @@ static int radeon_move_blit(drm_buffer_object_t * bo, DRM_RADEON_FENCE_FLAG_FLUSHED, new_mem); } -static int radeon_move_flip(drm_buffer_object_t * bo, - int evict, int no_wait, drm_bo_mem_reg_t * new_mem) +static int radeon_move_flip(struct drm_buffer_object * bo, + int evict, int no_wait, struct drm_bo_mem_reg * new_mem) { - drm_device_t *dev = bo->dev; - drm_bo_mem_reg_t tmp_mem; + struct drm_device *dev = bo->dev; + struct drm_bo_mem_reg tmp_mem; int ret; tmp_mem = *new_mem; @@ -223,7 +223,7 @@ static int radeon_move_flip(drm_buffer_object_t * bo, if (ret) return ret; - ret = drm_bind_ttm(bo->ttm, 1, tmp_mem.mm_node->start); + ret = drm_bind_ttm(bo->ttm, &tmp_mem); if (ret) goto out_cleanup; @@ -243,10 +243,10 @@ out_cleanup: return ret; } -int radeon_move(drm_buffer_object_t * bo, - int evict, int no_wait, drm_bo_mem_reg_t * new_mem) +int radeon_move(struct drm_buffer_object * bo, + int evict, int no_wait, struct drm_bo_mem_reg * new_mem) { - drm_bo_mem_reg_t *old_mem = &bo->mem; + struct drm_bo_mem_reg *old_mem = &bo->mem; DRM_DEBUG("\n"); if (old_mem->mem_type == DRM_BO_MEM_LOCAL) { |