diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-01-25 15:27:53 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-01-25 15:27:53 +1000 |
| commit | e7a41d7f5be49241480a20eb733262712e0f8dcb (patch) | |
| tree | 801c7eadf769db981dfb8a900a24ef48542958a6 /linux-core/radeon_buffer.c | |
| parent | fb9ea12438de95a6ac085879e079055eaea3daf8 (diff) | |
| parent | bfdddd218ec3e7ce3f8e765b93af35661a7bf0fd (diff) | |
Merge remote branch 'origin/master' into modesetting-101
Conflicts:
linux-core/drm_bo.c
linux-core/drm_drv.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
shared-core/radeon_irq.c
Diffstat (limited to 'linux-core/radeon_buffer.c')
| -rw-r--r-- | linux-core/radeon_buffer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c index 8e2b20b1..5dff1898 100644 --- a/linux-core/radeon_buffer.c +++ b/linux-core/radeon_buffer.c @@ -65,7 +65,7 @@ int radeon_invalidate_caches(struct drm_device * dev, uint64_t flags) return 0; } -uint32_t radeon_evict_mask(struct drm_buffer_object *bo) +uint64_t radeon_evict_flags(struct drm_buffer_object *bo) { switch (bo->mem.mem_type) { case DRM_BO_MEM_LOCAL: @@ -216,14 +216,14 @@ static int radeon_move_flip(struct drm_buffer_object * bo, tmp_mem = *new_mem; tmp_mem.mm_node = NULL; - tmp_mem.mask = DRM_BO_FLAG_MEM_TT | + tmp_mem.flags = DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_CACHED | DRM_BO_FLAG_FORCE_CACHING; ret = drm_bo_mem_space(bo, &tmp_mem, no_wait); if (ret) return ret; - ret = drm_bind_ttm(bo->ttm, &tmp_mem); + ret = drm_ttm_bind(bo->ttm, &tmp_mem); if (ret) goto out_cleanup; |