diff options
author | Dave Airlie <airlied@panoply-rh.(none)> | 2008-03-05 10:37:02 +1000 |
---|---|---|
committer | Dave Airlie <airlied@panoply-rh.(none)> | 2008-03-05 10:37:02 +1000 |
commit | 43891ff2d0176f013796b3c2a340b7d379d703ee (patch) | |
tree | 734cdcd6e6c36997f1db92d41b92e4557ebf13b1 /linux-core/drm_objects.h | |
parent | 81db48536c9d7bb23c448af6a6f1de81df755585 (diff) | |
parent | a6a2f2c8c491617de702dc7d62bb55cbada4d42b (diff) |
Merge remote branch 'origin/master' into modesetting-101
Conflicts:
linux-core/drm_compat.c
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 cce58178..802e72cf 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 */ @@ -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); /* |