openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: venus: vdec: allow bigger sizeimage set by clients 

In most of the cases the client will know better what could be
the maximum size for compressed data buffers. Change the driver
to permit the user to set bigger size for the compressed buffer
but make reasonable sanitation.

Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Stanimir Varbanov 2019-01-16 14:48:47 -02:00 committed by Mauro Carvalho Chehab
parent cef697d8a0
commit be76f150bc
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/media/platform/qcom/venus/vdec.c
View File

@ -133,6 +133,7 @@ vdec_try_fmt_common(struct venus_inst *inst, struct v4l2_format *f)
struct v4l2_pix_format_mplane *pixmp = &f->fmt.pix_mp; struct v4l2_pix_format_mplane *pixmp = &f->fmt.pix_mp;
struct v4l2_plane_pix_format *pfmt = pixmp->plane_fmt; struct v4l2_plane_pix_format *pfmt = pixmp->plane_fmt;
const struct venus_format *fmt; const struct venus_format *fmt;
u32 szimage;
memset(pfmt[0].reserved, 0, sizeof(pfmt[0].reserved)); memset(pfmt[0].reserved, 0, sizeof(pfmt[0].reserved));
memset(pixmp->reserved, 0, sizeof(pixmp->reserved)); memset(pixmp->reserved, 0, sizeof(pixmp->reserved));
@ -161,14 +162,17 @@ vdec_try_fmt_common(struct venus_inst *inst, struct v4l2_format *f)
pixmp->num_planes = fmt->num_planes; pixmp->num_planes = fmt->num_planes;
pixmp->flags = 0; pixmp->flags = 0;
pfmt[0].sizeimage = venus_helper_get_framesz(pixmp->pixelformat, szimage = venus_helper_get_framesz(pixmp->pixelformat, pixmp->width,
pixmp->width,
pixmp->height); pixmp->height);
if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
pfmt[0].sizeimage = szimage;
pfmt[0].bytesperline = ALIGN(pixmp->width, 128); pfmt[0].bytesperline = ALIGN(pixmp->width, 128);
else } else {
pfmt[0].sizeimage = clamp_t(u32, pfmt[0].sizeimage, 0, SZ_8M);
pfmt[0].sizeimage = max(pfmt[0].sizeimage, szimage);
pfmt[0].bytesperline = 0; pfmt[0].bytesperline = 0;
}
return fmt; return fmt;
} }
@ -266,6 +270,7 @@ static int vdec_s_fmt(struct file *file, void *fh, struct v4l2_format *f)
inst->ycbcr_enc = pixmp->ycbcr_enc; inst->ycbcr_enc = pixmp->ycbcr_enc;
inst->quantization = pixmp->quantization; inst->quantization = pixmp->quantization;
inst->xfer_func = pixmp->xfer_func; inst->xfer_func = pixmp->xfer_func;
inst->input_buf_size = pixmp->plane_fmt[0].sizeimage;
} }
memset(&format, 0, sizeof(format)); memset(&format, 0, sizeof(format));
@ -728,6 +733,7 @@ static int vdec_queue_setup(struct vb2_queue *q,
sizes[0] = venus_helper_get_framesz(inst->fmt_out->pixfmt, sizes[0] = venus_helper_get_framesz(inst->fmt_out->pixfmt,
inst->out_width, inst->out_width,
inst->out_height); inst->out_height);
sizes[0] = max(sizes[0], inst->input_buf_size);
inst->input_buf_size = sizes[0]; inst->input_buf_size = sizes[0];
*num_buffers = max(*num_buffers, in_num); *num_buffers = max(*num_buffers, in_num);
inst->num_input_bufs = *num_buffers; inst->num_input_bufs = *num_buffers;