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 /drivers/gpu/drm/gma500 | |
parent | afa95e7403298110943bc2dc0ab25f8b42b6334c (diff) | |
parent | d2c87e2d2377966450cfb4271694c77dac615f98 (diff) | |
download | linux-f71c5d9dd22f4d6b771cdb591050c84946a3e356.tar.bz2 |
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 'drivers/gpu/drm/gma500')
-rw-r--r-- | drivers/gpu/drm/gma500/gtt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/gma500/gtt.c b/drivers/gpu/drm/gma500/gtt.c index 592d205a0089..ce015db59dc6 100644 --- a/drivers/gpu/drm/gma500/gtt.c +++ b/drivers/gpu/drm/gma500/gtt.c @@ -206,7 +206,7 @@ static int psb_gtt_attach_pages(struct gtt_range *gt) WARN_ON(gt->pages); - pages = drm_gem_get_pages(>->gem, 0); + pages = drm_gem_get_pages(>->gem); if (IS_ERR(pages)) return PTR_ERR(pages); |