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 /shared-core/radeon_ms.h | |
| 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 'shared-core/radeon_ms.h')
| -rw-r--r-- | shared-core/radeon_ms.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shared-core/radeon_ms.h b/shared-core/radeon_ms.h index a784882b..66533837 100644 --- a/shared-core/radeon_ms.h +++ b/shared-core/radeon_ms.h @@ -338,7 +338,7 @@ int radeon_ms_bo_get_gpu_addr(struct drm_device *dev, int radeon_ms_bo_move(struct drm_buffer_object * bo, int evict, int no_wait, struct drm_bo_mem_reg * new_mem); struct drm_ttm_backend *radeon_ms_create_ttm_backend(struct drm_device * dev); -uint32_t radeon_ms_evict_mask(struct drm_buffer_object *bo); +uint64_t radeon_ms_evict_flags(struct drm_buffer_object *bo); int radeon_ms_init_mem_type(struct drm_device * dev, uint32_t type, struct drm_mem_type_manager * man); int radeon_ms_invalidate_caches(struct drm_device * dev, uint64_t flags); |