mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 23:53:32 +00:00
Code Issues Releases Wiki Activity

drm/armada: use shmem helpers if possible

Browse source 
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>
This commit is contained in:
David Herrmann 2014-05-25 14:34:09 +02:00 committed by Dave Airlie
parent 2123000b01
commit 2524fc7f63
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/armada/armada_gem.c
View file

@ -433,7 +433,6 @@ armada_gem_prime_map_dma_buf(struct dma_buf_attachment *attach,
if (dobj->obj.filp) { if (dobj->obj.filp) {
struct address_space *mapping; struct address_space *mapping;
gfp_t gfp;
int count; int count;
count = dobj->obj.size / PAGE_SIZE; count = dobj->obj.size / PAGE_SIZE;
@ -441,12 +440,11 @@ armada_gem_prime_map_dma_buf(struct dma_buf_attachment *attach,
goto free_sgt; goto free_sgt;
mapping = file_inode(dobj->obj.filp)->i_mapping; mapping = file_inode(dobj->obj.filp)->i_mapping;
gfp = mapping_gfp_mask(mapping);
for_each_sg(sgt->sgl, sg, count, i) { for_each_sg(sgt->sgl, sg, count, i) {
struct page *page; struct page *page;
page = shmem_read_mapping_page_gfp(mapping, i, gfp); page = shmem_read_mapping_page(mapping, i);
if (IS_ERR(page)) { if (IS_ERR(page)) {
num = i; num = i;
goto release; goto release;