diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-07-08 11:08:31 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-07-08 11:08:31 +1000 |
| commit | f71c5d9dd22f4d6b771cdb591050c84946a3e356 (patch) | |
| tree | a56b10220859bad7b73459eabf5c04409163a261 /include/drm/drmP.h | |
| parent | afa95e7403298110943bc2dc0ab25f8b42b6334c (diff) | |
| parent | d2c87e2d2377966450cfb4271694c77dac615f98 (diff) | |
| download | op-kernel-dev-f71c5d9dd22f4d6b771cdb591050c84946a3e356.zip op-kernel-dev-f71c5d9dd22f4d6b771cdb591050c84946a3e356.tar.gz | |
Merge branch 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux into drm-next
* 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux:
drm/omap: remove null test before kfree
drm/bochs: replace ALIGN(PAGE_SIZE) by PAGE_ALIGN
drm/ttm: recognize ARM arch in ioprot handler
drm: enable render-nodes by default
drm/ttm: remove declaration of ttm_tt_cache_flush
drm/gem: remove misleading gfp parameter to get_pages()
drm/omap: use __GFP_DMA32 for shmem-backed gem
drm/i915: use shmem helpers if possible
Conflicts:
drivers/gpu/drm/drm_stub.c
Diffstat (limited to 'include/drm/drmP.h')
| -rw-r--r-- | include/drm/drmP.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 57ecc42..a134479 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1395,7 +1395,6 @@ extern void drm_master_put(struct drm_master **master); extern void drm_put_dev(struct drm_device *dev); extern void drm_unplug_dev(struct drm_device *dev); extern unsigned int drm_debug; -extern unsigned int drm_rnodes; extern unsigned int drm_universal_planes; extern unsigned int drm_vblank_offdelay; @@ -1585,7 +1584,7 @@ void drm_gem_free_mmap_offset(struct drm_gem_object *obj); int drm_gem_create_mmap_offset(struct drm_gem_object *obj); int drm_gem_create_mmap_offset_size(struct drm_gem_object *obj, size_t size); -struct page **drm_gem_get_pages(struct drm_gem_object *obj, gfp_t gfpmask); +struct page **drm_gem_get_pages(struct drm_gem_object *obj); void drm_gem_put_pages(struct drm_gem_object *obj, struct page **pages, bool dirty, bool accessed); |
