Skip to content

Commit ba9fe2e

Browse files
anholtgregkh
authored andcommitted
drm/msm: Expose our reservation object when exporting a dmabuf.
commit 43523eba79bda8f5b4c27f8ffe20ea078d20113a upstream. 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: Rob Clark <robdclark@gmail.com> Cc: linux-arm-msm@vger.kernel.org Cc: freedreno@lists.freedesktop.org Reviewed-by: Rob Clark <robdclark@gmail.com> Signed-off-by: Rob Clark <robdclark@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 934d0a9 commit ba9fe2e

3 files changed

Lines changed: 9 additions & 0 deletions

File tree

drivers/gpu/drm/msm/msm_drv.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -986,6 +986,7 @@ static struct drm_driver msm_driver = {
986986
.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
987987
.gem_prime_export = drm_gem_prime_export,
988988
.gem_prime_import = drm_gem_prime_import,
989+
.gem_prime_res_obj = msm_gem_prime_res_obj,
989990
.gem_prime_pin = msm_gem_prime_pin,
990991
.gem_prime_unpin = msm_gem_prime_unpin,
991992
.gem_prime_get_sg_table = msm_gem_prime_get_sg_table,

drivers/gpu/drm/msm/msm_drv.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj);
212212
void *msm_gem_prime_vmap(struct drm_gem_object *obj);
213213
void msm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
214214
int msm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma);
215+
struct reservation_object *msm_gem_prime_res_obj(struct drm_gem_object *obj);
215216
struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev,
216217
struct dma_buf_attachment *attach, struct sg_table *sg);
217218
int msm_gem_prime_pin(struct drm_gem_object *obj);

drivers/gpu/drm/msm/msm_gem_prime.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,10 @@ void msm_gem_prime_unpin(struct drm_gem_object *obj)
7070
if (!obj->import_attach)
7171
msm_gem_put_pages(obj);
7272
}
73+
74+
struct reservation_object *msm_gem_prime_res_obj(struct drm_gem_object *obj)
75+
{
76+
struct msm_gem_object *msm_obj = to_msm_bo(obj);
77+
78+
return msm_obj->resv;
79+
}

0 commit comments

Comments
 (0)