diff options
| author | Jerome Glisse <glisse@freedesktop.org> | 2008-03-10 23:36:27 +0100 |
|---|---|---|
| committer | John Doe <glisse@freedesktop.org> | 2008-03-10 23:36:27 +0100 |
| commit | a7e6ca62ad0d9c3c45fd9e1d81b59c2db2d714cf (patch) | |
| tree | 8f757eeaa2c234af14ca1df515de7810e770ed91 /linux-core/drm_objects.h | |
| parent | a7dc4d08b9b4f8fe6fcaa4c778f6dd3718d1e36a (diff) | |
| parent | 9f19e79f955281b9de393219e4ad9835ffe29c49 (diff) | |
Merge branch 'modesetting-101' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Diffstat (limited to 'linux-core/drm_objects.h')
| -rw-r--r-- | linux-core/drm_objects.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linux-core/drm_objects.h b/linux-core/drm_objects.h index cce58178..8f81b665 100644 --- a/linux-core/drm_objects.h +++ b/linux-core/drm_objects.h @@ -383,7 +383,7 @@ extern int drm_ttm_destroy(struct drm_ttm *ttm); * The array of page pointers was allocated with vmalloc * instead of drm_calloc. */ -#define DRM_TTM_PAGE_VMALLOC (1 << 4) +#define DRM_TTM_PAGEDIR_VMALLOC (1 << 4) /* * This ttm is mapped from user space */ @@ -700,7 +700,7 @@ extern int drm_bo_do_validate(struct drm_buffer_object *bo, uint64_t flags, uint64_t mask, uint32_t hint, uint32_t fence_class, struct drm_bo_info_rep *rep); - +extern int drm_bo_evict_cached(struct drm_buffer_object *bo); /* * Buffer object memory move- and map helpers. * drm_bo_move.c @@ -741,6 +741,10 @@ static inline void *drm_bmo_virtual(struct drm_bo_kmap_obj *map, int *is_iomem) extern void drm_bo_kunmap(struct drm_bo_kmap_obj *map); extern int drm_bo_kmap(struct drm_buffer_object *bo, unsigned long start_page, unsigned long num_pages, struct drm_bo_kmap_obj *map); +extern int drm_bo_pfn_prot(struct drm_buffer_object *bo, + unsigned long dst_offset, + unsigned long *pfn, + pgprot_t *prot); /* |