diff options
| author | Eric Anholt <eric@anholt.net> | 2007-08-16 09:23:09 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-08-16 09:23:09 -0700 |
| commit | 0055fd5c35306a6363b0414f7f2220b3d1c27ecc (patch) | |
| tree | 40178e87d98efeb4bd9e0030b989a31e2090b9c9 /linux-core/drm_objects.h | |
| parent | 3a0bc518e35c62bb9c64c9105f836584d949653f (diff) | |
| parent | 02c4e0e757b69cd6ae38b8ab2c078b3f06fea661 (diff) | |
Merge branch 'master' into bo-set-pin
Diffstat (limited to 'linux-core/drm_objects.h')
| -rw-r--r-- | linux-core/drm_objects.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/linux-core/drm_objects.h b/linux-core/drm_objects.h index 64f71651..096041d7 100644 --- a/linux-core/drm_objects.h +++ b/linux-core/drm_objects.h @@ -484,6 +484,17 @@ extern int drm_bo_mem_space(struct drm_buffer_object * bo, struct drm_bo_mem_reg * mem, int no_wait); extern int drm_bo_move_buffer(struct drm_buffer_object * bo, uint32_t new_mem_flags, int no_wait, int move_unfenced); +extern int drm_buffer_object_create(struct drm_device *dev, unsigned long size, + enum drm_bo_type type, uint64_t mask, + uint32_t hint, uint32_t page_alignment, + unsigned long buffer_start, + struct drm_buffer_object **bo); +extern int drm_bo_init_mm(struct drm_device *dev, unsigned type, + unsigned long p_offset, unsigned long p_size); +extern int drm_bo_clean_mm(struct drm_device *dev, unsigned mem_type); +extern int drm_bo_add_user_object(struct drm_file *file_priv, + struct drm_buffer_object *bo, int sharable); +extern void drm_bo_usage_deref_unlocked(struct drm_buffer_object **bo); /* * Buffer object memory move helpers. @@ -503,6 +514,11 @@ extern int drm_bo_move_accel_cleanup(struct drm_buffer_object * bo, uint32_t fence_flags, struct drm_bo_mem_reg * new_mem); +extern int drm_mem_reg_ioremap(struct drm_device *dev, + struct drm_bo_mem_reg *mem, void **virtual); +extern void drm_mem_reg_iounmap(struct drm_device *dev, + struct drm_bo_mem_reg *mem, void *virtual); + #ifdef CONFIG_DEBUG_MUTEXES #define DRM_ASSERT_LOCKED(_mutex) \ BUG_ON(!mutex_is_locked(_mutex) || \ |