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

Groups > linux.kernel > #1620821

[PATCH 1/3] drm/msm: 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>
Cc: stable@vger.kernel.org
Cc: Rob Clark <robdclark@gmail.com>
Cc: linux-arm-msm@vger.kernel.org
Cc: freedreno@lists.freedesktop.org
---

Note: compile-tested only.

 drivers/gpu/drm/msm/msm_drv.c       | 1 +
 drivers/gpu/drm/msm/msm_drv.h       | 1 +
 drivers/gpu/drm/msm/msm_gem_prime.c | 7 +++++++
 3 files changed, 9 insertions(+)

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 9208e67be453..fe728a134e16 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -829,6 +829,7 @@ static struct drm_driver msm_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  = msm_gem_prime_res_obj,
 	.gem_prime_pin      = msm_gem_prime_pin,
 	.gem_prime_unpin    = msm_gem_prime_unpin,
 	.gem_prime_get_sg_table = msm_gem_prime_get_sg_table,
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index b885c3d5ae4d..5e67fa66d483 100644
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -223,6 +223,7 @@ struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj);
 void *msm_gem_prime_vmap(struct drm_gem_object *obj);
 void msm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
 int msm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma);
+struct reservation_object *msm_gem_prime_res_obj(struct drm_gem_object *obj);
 struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev,
 		struct dma_buf_attachment *attach, struct sg_table *sg);
 int msm_gem_prime_pin(struct drm_gem_object *obj);
diff --git a/drivers/gpu/drm/msm/msm_gem_prime.c b/drivers/gpu/drm/msm/msm_gem_prime.c
index 60bb290700ce..13403c6da6c7 100644
--- a/drivers/gpu/drm/msm/msm_gem_prime.c
+++ b/drivers/gpu/drm/msm/msm_gem_prime.c
@@ -70,3 +70,10 @@ void msm_gem_prime_unpin(struct drm_gem_object *obj)
 	if (!obj->import_attach)
 		msm_gem_put_pages(obj);
 }
+
+struct reservation_object *msm_gem_prime_res_obj(struct drm_gem_object *obj)
+{
+	struct msm_gem_object *msm_obj = to_msm_bo(obj);
+
+	return msm_obj->resv;
+}
-- 
2.11.0

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

Thread

[PATCH 1/3] drm/msm: Expose our reservation object when exporting a dmabuf. Eric Anholt <eric@anholt.net> - 2017-04-11 03:50 +0200
  [PATCH 3/3] drm/vc4: Add support for dma-buf fencing. Eric Anholt <eric@anholt.net> - 2017-04-11 03:50 +0200
    Re: [PATCH 3/3] drm/vc4: Add support for dma-buf fencing. Chris Wilson <chris@chris-wilson.co.uk> - 2017-04-11 11:40 +0200
      Re: [PATCH 3/3] drm/vc4: Add support for dma-buf fencing. Eric Anholt <eric@anholt.net> - 2017-04-11 19:50 +0200
        Re: [PATCH 3/3] drm/vc4: Add support for dma-buf fencing. Daniel Vetter <daniel@ffwll.ch> - 2017-04-12 14:50 +0200
    Re: [PATCH 3/3] drm/vc4: Add support for dma-buf fencing. Daniel Vetter <daniel@ffwll.ch> - 2017-04-12 14:50 +0200
      Re: [PATCH 3/3] drm/vc4: Add support for dma-buf fencing. Eric Anholt <eric@anholt.net> - 2017-04-12 19:40 +0200
  [PATCH 2/3] drm/etnaviv: Expose our reservation object when exporting a dmabuf. Eric Anholt <eric@anholt.net> - 2017-04-11 03:50 +0200
    Re: [PATCH 2/3] drm/etnaviv: Expose our reservation object when  exporting a dmabuf. Daniel Vetter <daniel@ffwll.ch> - 2017-04-12 14:50 +0200
      Re: [PATCH 2/3] drm/etnaviv: Expose our reservation object when  exporting a dmabuf. Lucas Stach <l.stach@pengutronix.de> - 2017-04-12 15:00 +0200
        Re: [PATCH 2/3] drm/etnaviv: Expose our reservation object when exporting a dmabuf. Eric Anholt <eric@anholt.net> - 2017-04-12 19:40 +0200

csiph-web