evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] media: davinci: vpif_capture: improve vpif_buffer_prepare() callback

Browse source 
this patch improve vpif_buffer_prepare() callback, as buf_prepare()
callback is never called with invalid state and check for
vb2_plane_vaddr(vb, 0) is dropped as payload check should
be done unconditionally.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Lad, Prabhakar 2014-05-16 10:33:37 -03:00 • committed by Mauro Carvalho Chehab
parent 7fd37fbd77
commit 23e76a2aaa
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
drivers/media/platform/davinci/vpif_capture.c
View file

@ -79,7 +79,7 @@ static inline struct vpif_cap_buffer *to_vpif_buffer(struct vb2_buffer *vb)
} }
/** /**
* buffer_prepare : callback function for buffer prepare * vpif_buffer_prepare : callback function for buffer prepare
* @vb: ptr to vb2_buffer * @vb: ptr to vb2_buffer
* *
* This is the callback function for buffer prepare when vb2_qbuf() * This is the callback function for buffer prepare when vb2_qbuf()
@ -97,26 +97,22 @@ static int vpif_buffer_prepare(struct vb2_buffer *vb)
common = &ch->common[VPIF_VIDEO_INDEX]; common = &ch->common[VPIF_VIDEO_INDEX];
if (vb->state != VB2_BUF_STATE_ACTIVE && vb2_set_plane_payload(vb, 0, common->fmt.fmt.pix.sizeimage);
vb->state != VB2_BUF_STATE_PREPARED) { if (vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))
vb2_set_plane_payload(vb, 0, common->fmt.fmt.pix.sizeimage); return -EINVAL;
if (vb2_plane_vaddr(vb, 0) &&
vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))
goto exit;
addr = vb2_dma_contig_plane_dma_addr(vb, 0);
if (q->streaming) { vb->v4l2_buf.field = common->fmt.fmt.pix.field;
if (!IS_ALIGNED((addr + common->ytop_off), 8) ||
!IS_ALIGNED((addr + common->ybtm_off), 8) || addr = vb2_dma_contig_plane_dma_addr(vb, 0);
!IS_ALIGNED((addr + common->ctop_off), 8) || if (!IS_ALIGNED((addr + common->ytop_off), 8) ||
!IS_ALIGNED((addr + common->cbtm_off), 8)) !IS_ALIGNED((addr + common->ybtm_off), 8) ||
goto exit; !IS_ALIGNED((addr + common->ctop_off), 8) ||
} !IS_ALIGNED((addr + common->cbtm_off), 8)) {
vpif_dbg(1, debug, "offset is not aligned\n");
return -EINVAL;
} }
return 0; return 0;
exit:
vpif_dbg(1, debug, "buffer_prepare:offset is not aligned to 8 bytes\n");
return -EINVAL;
} }
/** /**