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

Commit 50d9481d authored by Prabhakar Lad's avatar Prabhakar Lad Committed by Mauro Carvalho Chehab
Browse files

[media] media: davinci: vpbe: improve vpbe_buffer_prepare() callback 



this patch improve vpbe_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: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent f2095f65

drivers/media/platform/davinci/vpbe_display.c

+8 −15
Original line number Diff line number Diff line
@@ -215,23 +215,16 @@ static int vpbe_buffer_prepare(struct vb2_buffer *vb) 
	v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev,

				"vpbe_buffer_prepare\n");



	if (vb->state != VB2_BUF_STATE_ACTIVE &&

		vb->state != VB2_BUF_STATE_PREPARED) {

	vb2_set_plane_payload(vb, 0, layer->pix_fmt.sizeimage);

		if (vb2_plane_vaddr(vb, 0) &&

		vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))

	if (vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))

		return -EINVAL;



	addr = vb2_dma_contig_plane_dma_addr(vb, 0);

		if (q->streaming) {

	if (!IS_ALIGNED(addr, 8)) {

		v4l2_err(&vpbe_dev->v4l2_dev,

					"buffer_prepare:offset is \

					not aligned to 32 bytes\n");

			 "buffer_prepare:offset is not aligned to 32 bytes\n");

		return -EINVAL;

	}

		}

	}

	return 0;

}