Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce3088fd authored by Lucas Stach's avatar Lucas Stach
Browse files

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: default avatarLucas Stach <l.stach@pengutronix.de>
parent 9f07bb0d

drivers/gpu/drm/etnaviv/etnaviv_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

int etnaviv_gem_prime_pin(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,

		struct timespec *timeout);

int etnaviv_gem_cpu_fini(struct drm_gem_object *obj);

drivers/gpu/drm/etnaviv/etnaviv_dump.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu) 


		iter.hdr->iova = cpu_to_le64(vram->iova);



		vaddr = etnaviv_gem_vaddr(&obj->base);

		vaddr = etnaviv_gem_vmap(&obj->base);

		if (vaddr)

			memcpy(iter.data, vaddr, obj->base.size);

drivers/gpu/drm/etnaviv/etnaviv_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ void etnaviv_gem_put_iova(struct etnaviv_gpu *gpu, struct drm_gem_object *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);

drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

	return etnaviv_gem_vaddr(obj);

	return etnaviv_gem_vmap(obj);

}



void etnaviv_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr)