diff options
| author | Eric Anholt <eric@anholt.net> | 2007-09-21 17:05:21 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-09-21 17:12:19 -0700 |
| commit | 24e33627c5dfb92324a9faf1c7d366e7f33e622a (patch) | |
| tree | ad03240f73433518b42eeabd4fad14e8ee34184e /linux-core/drm_objects.h | |
| parent | 7587e9682c1b70930c015915d588b42ccd00c7c4 (diff) | |
| parent | e7bfeb3031374653f7e55d67cc1b5c823849359f (diff) | |
Merge branch 'bo-set-pin'
This branch replaces the NO_MOVE/NO_EVICT flags to buffer validation with a
separate privileged ioctl to pin buffers like NO_EVICT meant before. The
functionality that was supposed to be covered by NO_MOVE may be reintroduced
later, possibly in a different way, after the superioctl branch is merged.
Diffstat (limited to 'linux-core/drm_objects.h')
| -rw-r--r-- | linux-core/drm_objects.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-core/drm_objects.h b/linux-core/drm_objects.h index e34fdbc4..096041d7 100644 --- a/linux-core/drm_objects.h +++ b/linux-core/drm_objects.h @@ -362,6 +362,7 @@ struct drm_buffer_object { struct mutex mutex; /* For pinned buffers */ + int pinned; struct drm_mm_node *pinned_node; uint32_t pinned_mem_type; struct list_head pinned_lru; @@ -455,7 +456,7 @@ extern int drm_bo_unreference_ioctl(struct drm_device *dev, void *data, struct d extern int drm_bo_wait_idle_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); extern int drm_bo_info_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); extern int drm_bo_op_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); - +int drm_bo_set_pin_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); extern int drm_mm_init_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); extern int drm_mm_takedown_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); |