Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-23 19:31:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] media: ti-vpe: vpe: allow use of user specified stride

Browse Source 
Bytesperline/stride was always overwritten by VPE to the most
adequate value based on needed alignment.

However in order to make use of arbitrary size DMA buffer it
is better to use the user space provide stride instead.

The driver will still calculate an appropriate stride but will
use the provided one when it is larger than the calculated one.

Signed-off-by: Benoit Parrot <bparrot@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Benoit Parrot 2017-02-13 11:06:58 -02:00 committed by Mauro Carvalho Chehab
parent da4414eaed
commit 3dc2046ca7
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/media/platform/ti-vpe/vpe.c
View File

@ -1597,6 +1597,7 @@ static int __vpe_try_fmt(struct vpe_ctx *ctx, struct v4l2_format *f,
struct v4l2_plane_pix_format *plane_fmt;
unsigned int w_align;
int i, depth, depth_bytes, height;
unsigned int stride = 0;
if (!fmt || !(fmt->types & type)) {
vpe_err(ctx->dev, "Fourcc format (0x%08x) invalid.\n",
@ -1683,16 +1684,27 @@ static int __vpe_try_fmt(struct vpe_ctx *ctx, struct v4l2_format *f,
plane_fmt = &pix->plane_fmt[i];
depth = fmt->vpdma_fmt[i]->depth;
if (i == VPE_LUMA)
plane_fmt->bytesperline = (pix->width * depth) >> 3;
else
plane_fmt->bytesperline = pix->width;
stride = (pix->width * fmt->vpdma_fmt[VPE_LUMA]->depth) >> 3;
if (stride > plane_fmt->bytesperline)
plane_fmt->bytesperline = stride;
if (pix->num_planes == 1 && fmt->coplanar)
depth += fmt->vpdma_fmt[VPE_CHROMA]->depth;
plane_fmt->sizeimage =
(pix->height * pix->width * depth) >> 3;
plane_fmt->bytesperline = ALIGN(plane_fmt->bytesperline,
VPDMA_STRIDE_ALIGN);
if (i == VPE_LUMA) {
plane_fmt->sizeimage = pix->height *
plane_fmt->bytesperline;
if (pix->num_planes == 1 && fmt->coplanar)
plane_fmt->sizeimage += pix->height *
plane_fmt->bytesperline *
fmt->vpdma_fmt[VPE_CHROMA]->depth >> 3;
} else { /* i == VIP_CHROMA */
plane_fmt->sizeimage = (pix->height *
plane_fmt->bytesperline *
depth) >> 3;
}
memset(plane_fmt->reserved, 0, sizeof(plane_fmt->reserved));
}