p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/etnaviv: rename etnaviv_gem_vaddr to etnaviv_gem_vmap 

This function follows the semantics of vmap() by returning
NULL in case of an error. To make things less confusing
rename it to make make both functions more closely related.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
This commit is contained in:
Lucas Stach 2016-01-26 18:10:32 +01:00
parent 9f07bb0d4a
commit ce3088fdb5
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/etnaviv/etnaviv_drv.h
View File

@ -85,7 +85,7 @@ struct drm_gem_object *etnaviv_gem_prime_import_sg_table(struct drm_device *dev,
struct dma_buf_attachment *attach, struct sg_table *sg); struct dma_buf_attachment *attach, struct sg_table *sg);
int etnaviv_gem_prime_pin(struct drm_gem_object *obj); int etnaviv_gem_prime_pin(struct drm_gem_object *obj);
void etnaviv_gem_prime_unpin(struct drm_gem_object *obj); void etnaviv_gem_prime_unpin(struct drm_gem_object *obj);
void *etnaviv_gem_vaddr(struct drm_gem_object *obj); void *etnaviv_gem_vmap(struct drm_gem_object *obj);
int etnaviv_gem_cpu_prep(struct drm_gem_object *obj, u32 op, int etnaviv_gem_cpu_prep(struct drm_gem_object *obj, u32 op,
struct timespec *timeout); struct timespec *timeout);
int etnaviv_gem_cpu_fini(struct drm_gem_object *obj); int etnaviv_gem_cpu_fini(struct drm_gem_object *obj);

2
drivers/gpu/drm/etnaviv/etnaviv_dump.c
View File

@ -215,7 +215,7 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu)
iter.hdr->iova = cpu_to_le64(vram->iova); iter.hdr->iova = cpu_to_le64(vram->iova);
vaddr = etnaviv_gem_vaddr(&obj->base); vaddr = etnaviv_gem_vmap(&obj->base);
if (vaddr) if (vaddr)
memcpy(iter.data, vaddr, obj->base.size); memcpy(iter.data, vaddr, obj->base.size);

2
drivers/gpu/drm/etnaviv/etnaviv_gem.c
View File

@ -353,7 +353,7 @@ void etnaviv_gem_put_iova(struct etnaviv_gpu *gpu, struct drm_gem_object *obj)
drm_gem_object_unreference_unlocked(obj); drm_gem_object_unreference_unlocked(obj);
} }
void *etnaviv_gem_vaddr(struct drm_gem_object *obj) void *etnaviv_gem_vmap(struct drm_gem_object *obj)
{ {
struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj); struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj);

2
drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
View File

@ -31,7 +31,7 @@ struct sg_table *etnaviv_gem_prime_get_sg_table(struct drm_gem_object *obj)
void *etnaviv_gem_prime_vmap(struct drm_gem_object *obj) void *etnaviv_gem_prime_vmap(struct drm_gem_object *obj)
{ {
return etnaviv_gem_vaddr(obj); return etnaviv_gem_vmap(obj);
} }
void etnaviv_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr) void etnaviv_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr)