From 28b5ef8f1c3774d2b7699f802febebc6a6e51527 Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Thu, 16 Apr 2020 16:54:37 -0700 Subject: [PATCH] ANDROID: Add C protos for dma_buf/drm_prime get_uuid Fixes I0599ce4cafee3dc705805c1ad97295bea264cfdf and Ifb429e36ebbba9feead6fd1792fbefa9ca097f0c. Bug: 153580313 Change-Id: Ia070392e45e8325dec53b51300d987b3f23f0920 Signed-off-by: Alistair Delva --- include/drm/drm_prime.h | 1 + include/linux/dma-buf.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/include/drm/drm_prime.h b/include/drm/drm_prime.h index 0c86d755cad9..a6f60d529b8c 100644 --- a/include/drm/drm_prime.h +++ b/include/drm/drm_prime.h @@ -104,5 +104,6 @@ int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **pages, struct sg_table *drm_prime_pages_to_sg(struct page **pages, unsigned int nr_pages); void drm_prime_gem_destroy(struct drm_gem_object *obj, struct sg_table *sg); +int drm_gem_dmabuf_get_uuid(struct dma_buf *dma_buf, uuid_t *uuid); #endif /* __DRM_PRIME_H__ */ diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h index 5087b24c25c6..dfdcff935fe1 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -549,6 +549,7 @@ int dma_buf_mmap(struct dma_buf *, struct vm_area_struct *, void *dma_buf_vmap(struct dma_buf *); void dma_buf_vunmap(struct dma_buf *, void *vaddr); int dma_buf_get_flags(struct dma_buf *dmabuf, unsigned long *flags); +int dma_buf_get_uuid(struct dma_buf *dmabuf, uuid_t *uuid); /** * dma_buf_set_destructor - set the dma-buf's destructor @@ -563,4 +564,5 @@ static inline void dma_buf_set_destructor(struct dma_buf *dmabuf, dmabuf->dtor = dtor; dmabuf->dtor_data = dtor_data; } + #endif /* __DMA_BUF_H__ */