Skip to content

Commit

Permalink
drm/etnaviv: take etnaviv_gem_obj in etnaviv_gem_mmap_obj
Browse files Browse the repository at this point in the history
This function will be changed to be called indirectly and this
prototype change brings it in line with all the other indirect
object calls.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
  • Loading branch information
Lucas Stach committed May 6, 2016
1 parent 946dd8d commit 0e7f26e
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions drivers/gpu/drm/etnaviv/etnaviv_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,9 @@ void etnaviv_gem_put_pages(struct etnaviv_gem_object *etnaviv_obj)
/* when we start tracking the pin count, then do something here */
}

static int etnaviv_gem_mmap_obj(struct drm_gem_object *obj,
static int etnaviv_gem_mmap_obj(struct etnaviv_gem_object *etnaviv_obj,
struct vm_area_struct *vma)
{
struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj);
pgprot_t vm_page_prot;

vma->vm_flags &= ~VM_PFNMAP;
Expand All @@ -151,9 +150,9 @@ static int etnaviv_gem_mmap_obj(struct drm_gem_object *obj,
* in particular in the case of mmap'd dmabufs)
*/
fput(vma->vm_file);
get_file(obj->filp);
get_file(etnaviv_obj->base.filp);
vma->vm_pgoff = 0;
vma->vm_file = obj->filp;
vma->vm_file = etnaviv_obj->base.filp;

vma->vm_page_prot = vm_page_prot;
}
Expand All @@ -173,7 +172,7 @@ int etnaviv_gem_mmap(struct file *filp, struct vm_area_struct *vma)
}

obj = to_etnaviv_bo(vma->vm_private_data);
return etnaviv_gem_mmap_obj(vma->vm_private_data, vma);
return etnaviv_gem_mmap_obj(obj, vma);
}

int etnaviv_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
Expand Down

0 comments on commit 0e7f26e

Please sign in to comment.