Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1622493

[PATCH v2 2/5] drm/etnaviv: Expose our reservation object when exporting a dmabuf.

Show all headers | View raw

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: Eric Anholt <eric@anholt.net>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
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
---
 drivers/gpu/drm/etnaviv/etnaviv_drv.c       | 1 +
 drivers/gpu/drm/etnaviv/etnaviv_drv.h       | 1 +
 drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 7 +++++++
 3 files changed, 9 insertions(+)

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
index 587e45043542..ff6db8f0d966 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
@@ -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,
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.h b/drivers/gpu/drm/etnaviv/etnaviv_drv.h
index e41f38667c1c..058389f93b69 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_drv.h
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.h
@@ -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);
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
index 62b47972a52e..abed6f781281 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
@@ -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;
+}
-- 
2.11.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/5] vc4 V3D fencing and msm/etnaviv cleanups Eric Anholt <eric@anholt.net> - 2017-04-12 21:20 +0200
  [PATCH v2 4/5] drm/etnaviv: Reuse dma_fence_release. Eric Anholt <eric@anholt.net> - 2017-04-12 21:20 +0200
    Re: [PATCH v2 4/5] drm/etnaviv: Reuse dma_fence_release. Daniel Vetter <daniel@ffwll.ch> - 2017-04-13 09:10 +0200
  [PATCH v2 5/5] drm/vc4: Expose dma-buf fences for V3D rendering. Eric Anholt <eric@anholt.net> - 2017-04-12 21:20 +0200
    Re: [PATCH v2 5/5] drm/vc4: Expose dma-buf fences for V3D rendering. Daniel Vetter <daniel@ffwll.ch> - 2017-04-13 09:20 +0200
      Re: [PATCH v2 5/5] drm/vc4: Expose dma-buf fences for V3D rendering. Eric Anholt <eric@anholt.net> - 2017-04-13 19:20 +0200
      Re: [PATCH v2 5/5] drm/vc4: Expose dma-buf fences for V3D rendering. Eric Anholt <eric@anholt.net> - 2017-04-13 20:10 +0200
  [PATCH v2 2/5] drm/etnaviv: Expose our reservation object when exporting a dmabuf. Eric Anholt <eric@anholt.net> - 2017-04-12 21:20 +0200
  [PATCH v2 1/5] drm/msm: Expose our reservation object when exporting a dmabuf. Eric Anholt <eric@anholt.net> - 2017-04-12 21:20 +0200
  [PATCH v2 3/5] drm/msm: Reuse dma_fence_release. Eric Anholt <eric@anholt.net> - 2017-04-12 21:20 +0200

csiph-web