diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-02-02 14:47:44 +0100 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-02-02 14:47:44 +0100 |
| commit | c269d560e4d71448cfc9c2ea51eee3d5feafaad4 (patch) | |
| tree | 066877fe801cd872fbab575dd21f2289eaf1a5ef /linux-core/drmP.h | |
| parent | dd733dea3856e7ddbba7c4c3928ccaba909b4535 (diff) | |
Make vm handle buffer objects instead of ttm objects.
Remove ttm objects.
Make vm aware of PCI memory type buffer objects.
(Only works for pre 2.6.16 kernels for now).
Diffstat (limited to 'linux-core/drmP.h')
| -rw-r--r-- | linux-core/drmP.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 090bd124..84a06470 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -1014,7 +1014,6 @@ typedef struct drm_buffer_object{ */ atomic_t usage; - drm_ttm_object_t *ttm_object; unsigned long buffer_start; drm_bo_type_t type; unsigned long offset; @@ -1037,6 +1036,7 @@ typedef struct drm_buffer_object{ /* For vm */ + drm_map_list_t map_list; drm_mm_node_t *node; uint32_t memory_type; drm_ttm_t *ttm; @@ -1485,6 +1485,11 @@ extern int drm_bo_ioctl(DRM_IOCTL_ARGS); extern int drm_mm_init_ioctl(DRM_IOCTL_ARGS); extern int drm_bo_driver_finish(drm_device_t *dev); extern int drm_bo_driver_init(drm_device_t *dev); +extern int drm_bo_pci_offset(const drm_buffer_object_t *bo, + unsigned long *bus_base, + unsigned long *bus_offset, + unsigned long *bus_size); +extern void drm_bo_usage_deref_locked(drm_buffer_object_t * bo); extern int drm_fence_buffer_objects(drm_file_t * priv, struct list_head *list, uint32_t fence_flags, |