diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2014-05-25 08:34:09 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-05-27 01:51:35 -0400 |
| commit | 2524fc7f634d33b044e9bf91689b932e54517980 (patch) | |
| tree | 17681f07d25fa90dcbb1b89841502ee694272ca0 /drivers/gpu/drm/armada | |
| parent | 2123000b01792e182fc4122fdb612ed641f3385e (diff) | |
drm/armada: use shmem helpers if possible
shmem_read_mapping_page() uses mapping_gfp_mask(mapping) as default gfp
mask. No reason to use shmem_read_mapping_page_gfp() directly if we want
the default behavior.
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/armada')
| -rw-r--r-- | drivers/gpu/drm/armada/armada_gem.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c index 887816f43476..bb9b642d8485 100644 --- a/drivers/gpu/drm/armada/armada_gem.c +++ b/drivers/gpu/drm/armada/armada_gem.c | |||
| @@ -433,7 +433,6 @@ armada_gem_prime_map_dma_buf(struct dma_buf_attachment *attach, | |||
| 433 | 433 | ||
| 434 | if (dobj->obj.filp) { | 434 | if (dobj->obj.filp) { |
| 435 | struct address_space *mapping; | 435 | struct address_space *mapping; |
| 436 | gfp_t gfp; | ||
| 437 | int count; | 436 | int count; |
| 438 | 437 | ||
| 439 | count = dobj->obj.size / PAGE_SIZE; | 438 | count = dobj->obj.size / PAGE_SIZE; |
| @@ -441,12 +440,11 @@ armada_gem_prime_map_dma_buf(struct dma_buf_attachment *attach, | |||
| 441 | goto free_sgt; | 440 | goto free_sgt; |
| 442 | 441 | ||
| 443 | mapping = file_inode(dobj->obj.filp)->i_mapping; | 442 | mapping = file_inode(dobj->obj.filp)->i_mapping; |
| 444 | gfp = mapping_gfp_mask(mapping); | ||
| 445 | 443 | ||
| 446 | for_each_sg(sgt->sgl, sg, count, i) { | 444 | for_each_sg(sgt->sgl, sg, count, i) { |
| 447 | struct page *page; | 445 | struct page *page; |
| 448 | 446 | ||
| 449 | page = shmem_read_mapping_page_gfp(mapping, i, gfp); | 447 | page = shmem_read_mapping_page(mapping, i); |
| 450 | if (IS_ERR(page)) { | 448 | if (IS_ERR(page)) { |
| 451 | num = i; | 449 | num = i; |
| 452 | goto release; | 450 | goto release; |
