samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

video: driver: Update vb2_mem_ops to match videobuf2 declearations

Browse Source 
Update driver vb2_mem_ops function declarations to match
videobuf2 header declarations.

Change-Id: I79cd2cfc42abed2bd659c7a08c3cb1aa3f5cd495
Signed-off-by: Mihir Ganu <quic_mganu@quicinc.com>
This commit is contained in:
Mihir Ganu
2022-01-17 21:27:03 -08:00
parent fb7d323e1c
commit 6dff43a315
2 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
driver/vidc/inc/msm_vidc_vb2.h
View File

@@ -14,14 +14,21 @@ struct vb2_queue *msm_vidc_get_vb2q(struct msm_vidc_inst *inst,
u32 type, const char *func); u32 type, const char *func);
/* vb2_mem_ops */ /* vb2_mem_ops */
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0))
void *msm_vb2_get_userptr(struct device *dev, unsigned long vaddr, void *msm_vb2_get_userptr(struct device *dev, unsigned long vaddr,
unsigned long size, enum dma_data_direction dma_dir); 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); unsigned long size, enum dma_data_direction dma_dir);
void msm_vb2_detach_dmabuf(void* buf_priv); #else
int msm_vb2_map_dmabuf(void* buf_priv); void *msm_vb2_get_userptr(struct vb2_buffer *vb, struct device *dev,
void msm_vb2_unmap_dmabuf(void* buf_priv); 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 */ /* vb2_ops */
int msm_vidc_queue_setup(struct vb2_queue *q, int msm_vidc_queue_setup(struct vb2_queue *q,

32
driver/vidc/src/msm_vidc_vb2.c
View File

@@ -38,32 +38,46 @@ struct vb2_queue *msm_vidc_get_vb2q(struct msm_vidc_inst *inst,
return q; return q;
} }
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0))
void *msm_vb2_get_userptr(struct device *dev, unsigned long vaddr, void *msm_vb2_get_userptr(struct device *dev, unsigned long vaddr,
unsigned long size, enum dma_data_direction dma_dir) unsigned long size, enum dma_data_direction dma_dir)
{ {
return (void *)0xdeadbeef; 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_put_userptr(void *buf_priv)
{ {
} }
void* msm_vb2_attach_dmabuf(struct device* dev, struct dma_buf* dbuf, void msm_vb2_detach_dmabuf(void *buf_priv)
unsigned long size, enum dma_data_direction dma_dir)
{
return (void*)0xdeadbeef;
}
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; return 0;
} }
void msm_vb2_unmap_dmabuf(void* buf_priv) void msm_vb2_unmap_dmabuf(void *buf_priv)
{ {
} }