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

Commit b3a42bb6 authored by Eric Anholt's avatar Eric Anholt Committed by Greg Kroah-Hartman
Browse files

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: default avatarEric Anholt <eric@anholt.net>
Reviewed-by: default avatarDaniel 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: default avatarRob Clark <robdclark@gmail.com>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 974a4eb1

drivers/gpu/drm/msm/msm_drv.c

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

	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,

	.gem_prime_export   = drm_gem_prime_export,

	.gem_prime_export   = drm_gem_prime_export,

	.gem_prime_import   = drm_gem_prime_import,

	.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_pin      = msm_gem_prime_pin,

	.gem_prime_unpin    = msm_gem_prime_unpin,

	.gem_prime_unpin    = msm_gem_prime_unpin,

	.gem_prime_get_sg_table = msm_gem_prime_get_sg_table,

	.gem_prime_get_sg_table = msm_gem_prime_get_sg_table,

drivers/gpu/drm/msm/msm_drv.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -203,6 +203,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_vmap(struct drm_gem_object *obj);

void msm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);

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

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 drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev,

		struct dma_buf_attachment *attach, struct sg_table *sg);

		struct dma_buf_attachment *attach, struct sg_table *sg);

int msm_gem_prime_pin(struct drm_gem_object *obj);

int msm_gem_prime_pin(struct drm_gem_object *obj);

drivers/gpu/drm/msm/msm_gem_prime.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -70,3 +70,10 @@ void msm_gem_prime_unpin(struct drm_gem_object *obj) 
	if (!obj->import_attach)

	if (!obj->import_attach)

		msm_gem_put_pages(obj);

		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;

}