From 6dff43a31518ae979c6571596a730c3f92ab85ec Mon Sep 17 00:00:00 2001 From: Mihir Ganu Date: Mon, 17 Jan 2022 21:27:03 -0800 Subject: [PATCH] video: driver: Update vb2_mem_ops to match videobuf2 declearations Update driver vb2_mem_ops function declarations to match videobuf2 header declarations. Change-Id: I79cd2cfc42abed2bd659c7a08c3cb1aa3f5cd495 Signed-off-by: Mihir Ganu --- driver/vidc/inc/msm_vidc_vb2.h | 17 ++++++++++++----- driver/vidc/src/msm_vidc_vb2.c | 32 +++++++++++++++++++++++--------- 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/driver/vidc/inc/msm_vidc_vb2.h b/driver/vidc/inc/msm_vidc_vb2.h index c4c66dfab7..140031c68a 100644 --- a/driver/vidc/inc/msm_vidc_vb2.h +++ b/driver/vidc/inc/msm_vidc_vb2.h @@ -14,14 +14,21 @@ struct vb2_queue *msm_vidc_get_vb2q(struct msm_vidc_inst *inst, u32 type, const char *func); /* vb2_mem_ops */ +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)) void *msm_vb2_get_userptr(struct device *dev, unsigned long vaddr, unsigned long size, enum dma_data_direction dma_dir); -void msm_vb2_put_userptr(void *buf_priv); -void* msm_vb2_attach_dmabuf(struct device* dev, struct dma_buf* dbuf, +void *msm_vb2_attach_dmabuf(struct device *dev, struct dma_buf *dbuf, unsigned long size, enum dma_data_direction dma_dir); -void msm_vb2_detach_dmabuf(void* buf_priv); -int msm_vb2_map_dmabuf(void* buf_priv); -void msm_vb2_unmap_dmabuf(void* buf_priv); +#else +void *msm_vb2_get_userptr(struct vb2_buffer *vb, struct device *dev, + unsigned long vaddr, unsigned long size); +void *msm_vb2_attach_dmabuf(struct vb2_buffer *vb, struct device *dev, + struct dma_buf *dbuf, unsigned long size); +#endif +void msm_vb2_put_userptr(void *buf_priv); +void msm_vb2_detach_dmabuf(void *buf_priv); +int msm_vb2_map_dmabuf(void *buf_priv); +void msm_vb2_unmap_dmabuf(void *buf_priv); /* vb2_ops */ int msm_vidc_queue_setup(struct vb2_queue *q, diff --git a/driver/vidc/src/msm_vidc_vb2.c b/driver/vidc/src/msm_vidc_vb2.c index e11daee1b7..4cfd2f9816 100644 --- a/driver/vidc/src/msm_vidc_vb2.c +++ b/driver/vidc/src/msm_vidc_vb2.c @@ -38,32 +38,46 @@ struct vb2_queue *msm_vidc_get_vb2q(struct msm_vidc_inst *inst, return q; } +#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)) void *msm_vb2_get_userptr(struct device *dev, unsigned long vaddr, unsigned long size, enum dma_data_direction dma_dir) { return (void *)0xdeadbeef; } +void *msm_vb2_attach_dmabuf(struct device *dev, struct dma_buf *dbuf, + unsigned long size, enum dma_data_direction dma_dir) +{ + return (void *)0xdeadbeef; +} +#else +void *msm_vb2_get_userptr(struct vb2_buffer *vb, struct device *dev, + unsigned long vaddr, unsigned long size) +{ + return (void *)0xdeadbeef; +} + +void *msm_vb2_attach_dmabuf(struct vb2_buffer *vb, struct device *dev, + struct dma_buf *dbuf, unsigned long size) +{ + return (void *)0xdeadbeef; +} +#endif + void msm_vb2_put_userptr(void *buf_priv) { } -void* msm_vb2_attach_dmabuf(struct device* dev, struct dma_buf* dbuf, - unsigned long size, enum dma_data_direction dma_dir) -{ - return (void*)0xdeadbeef; -} - -void msm_vb2_detach_dmabuf(void* buf_priv) +void msm_vb2_detach_dmabuf(void *buf_priv) { } -int msm_vb2_map_dmabuf(void* buf_priv) +int msm_vb2_map_dmabuf(void *buf_priv) { return 0; } -void msm_vb2_unmap_dmabuf(void* buf_priv) +void msm_vb2_unmap_dmabuf(void *buf_priv) { }