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

Commit 8555137e authored by Eric Anholt's avatar Eric Anholt Committed by Lucas Stach
Browse files

drm/etnaviv: Expose our reservation object when exporting a dmabuf. 



Without this, polling on the dma-buf (and presumably other devices
synchronizing against our rendering) would return immediately, even
while the BO was busy.

Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Cc: stable@vger.kernel.org
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Russell King <linux+etnaviv@armlinux.org.uk>
Cc: Christian Gmeiner <christian.gmeiner@gmail.com>
Cc: etnaviv@lists.freedesktop.org
Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
parent 657314b7

drivers/gpu/drm/etnaviv/etnaviv_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -495,6 +495,7 @@ static struct drm_driver etnaviv_drm_driver = { 
	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,

	.gem_prime_export   = drm_gem_prime_export,

	.gem_prime_import   = drm_gem_prime_import,

	.gem_prime_res_obj  = etnaviv_gem_prime_res_obj,

	.gem_prime_pin      = etnaviv_gem_prime_pin,

	.gem_prime_unpin    = etnaviv_gem_prime_unpin,

	.gem_prime_get_sg_table = etnaviv_gem_prime_get_sg_table,

drivers/gpu/drm/etnaviv/etnaviv_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ void *etnaviv_gem_prime_vmap(struct drm_gem_object *obj); 
void etnaviv_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);

int etnaviv_gem_prime_mmap(struct drm_gem_object *obj,

			   struct vm_area_struct *vma);

struct reservation_object *etnaviv_gem_prime_res_obj(struct drm_gem_object *obj);

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);

drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c

+7 −0
Original line number Diff line number Diff line
@@ -150,3 +150,10 @@ struct drm_gem_object *etnaviv_gem_prime_import_sg_table(struct drm_device *dev, 


	return ERR_PTR(ret);

}



struct reservation_object *etnaviv_gem_prime_res_obj(struct drm_gem_object *obj)

{

	struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj);



	return etnaviv_obj->resv;

}