diff options
author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2008-04-11 09:36:12 +0200 |
---|---|---|
committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2008-04-14 12:13:17 +0200 |
commit | 65dd0e68ff0e0e354925adb7d5fffeb0ffbb485c (patch) | |
tree | d30cbdbff640d25a7dbf2a47048ea50130098d79 /linux-core/drm_objects.h | |
parent | b986d7d2c9090fc62c1853f62886dd124e8066c1 (diff) |
Fix up buffer manager locking.
Diffstat (limited to 'linux-core/drm_objects.h')
-rw-r--r-- | linux-core/drm_objects.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linux-core/drm_objects.h b/linux-core/drm_objects.h index c32edacd..a1f3a18d 100644 --- a/linux-core/drm_objects.h +++ b/linux-core/drm_objects.h @@ -320,6 +320,8 @@ struct drm_ttm { int destroy; uint32_t mapping_offset; struct drm_ttm_backend *be; + unsigned long highest_lomem_entry; + unsigned long lowest_himem_entry; enum { ttm_bound, ttm_evicted, @@ -798,8 +800,10 @@ extern void drm_regs_init(struct drm_reg_manager *manager, extern void drm_bo_init_lock(struct drm_bo_lock *lock); extern void drm_bo_read_unlock(struct drm_bo_lock *lock); -extern int drm_bo_read_lock(struct drm_bo_lock *lock); +extern int drm_bo_read_lock(struct drm_bo_lock *lock, + int interruptible); extern int drm_bo_write_lock(struct drm_bo_lock *lock, + int interruptible, struct drm_file *file_priv); extern int drm_bo_write_unlock(struct drm_bo_lock *lock, |