Message ID | 1489423058-12492-6-git-send-email-stanimir.varbanov@linaro.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Some comments and questions below: On 03/13/17 17:37, Stanimir Varbanov wrote: > This consists of video decoder implementation plus decoder > controls. > > Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org> > --- > drivers/media/platform/qcom/venus/vdec.c | 1091 ++++++++++++++++++++++++ > drivers/media/platform/qcom/venus/vdec.h | 23 + > drivers/media/platform/qcom/venus/vdec_ctrls.c | 149 ++++ > 3 files changed, 1263 insertions(+) > create mode 100644 drivers/media/platform/qcom/venus/vdec.c > create mode 100644 drivers/media/platform/qcom/venus/vdec.h > create mode 100644 drivers/media/platform/qcom/venus/vdec_ctrls.c > > diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c > new file mode 100644 > index 000000000000..ec5203f2ba81 > --- /dev/null > +++ b/drivers/media/platform/qcom/venus/vdec.c > @@ -0,0 +1,1091 @@ > +/* > + * Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. > + * Copyright (C) 2017 Linaro Ltd. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 and > + * only version 2 as published by the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + */ > +#include <linux/clk.h> > +#include <linux/module.h> > +#include <linux/platform_device.h> > +#include <linux/pm_runtime.h> > +#include <linux/slab.h> > +#include <media/v4l2-ioctl.h> > +#include <media/v4l2-event.h> > +#include <media/v4l2-ctrls.h> > +#include <media/v4l2-mem2mem.h> > +#include <media/videobuf2-dma-sg.h> > + > +#include "hfi_venus_io.h" > +#include "core.h" > +#include "helpers.h" > +#include "vdec.h" > + > +static u32 get_framesize_uncompressed(unsigned int plane, u32 width, u32 height) > +{ > + u32 y_stride, uv_stride, y_plane; > + u32 y_sclines, uv_sclines, uv_plane; > + u32 size; > + > + y_stride = ALIGN(width, 128); > + uv_stride = ALIGN(width, 128); > + y_sclines = ALIGN(height, 32); > + uv_sclines = ALIGN(((height + 1) >> 1), 16); > + > + y_plane = y_stride * y_sclines; > + uv_plane = uv_stride * uv_sclines + SZ_4K; > + size = y_plane + uv_plane + SZ_8K; > + > + return ALIGN(size, SZ_4K); > +} > + > +static u32 get_framesize_compressed(unsigned int width, unsigned int height) > +{ > + return ((width * height * 3 / 2) / 2) + 128; > +} > + > +static const struct venus_format vdec_formats[] = { > + { > + .pixfmt = V4L2_PIX_FMT_NV12, > + .num_planes = 1, > + .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, Just curious: is NV12 the only uncompressed format supported by the hardware? Or just the only one that is implemented here? > + }, { > + .pixfmt = V4L2_PIX_FMT_MPEG4, > + .num_planes = 1, > + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, > + }, { > + .pixfmt = V4L2_PIX_FMT_MPEG2, > + .num_planes = 1, > + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, > + }, { > + .pixfmt = V4L2_PIX_FMT_H263, > + .num_planes = 1, > + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, > + }, { > + .pixfmt = V4L2_PIX_FMT_VC1_ANNEX_G, > + .num_planes = 1, > + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, > + }, { > + .pixfmt = V4L2_PIX_FMT_VC1_ANNEX_L, > + .num_planes = 1, > + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, > + }, { > + .pixfmt = V4L2_PIX_FMT_H264, > + .num_planes = 1, > + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, > + }, { > + .pixfmt = V4L2_PIX_FMT_VP8, > + .num_planes = 1, > + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, > + }, { > + .pixfmt = V4L2_PIX_FMT_XVID, > + .num_planes = 1, > + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, > + }, num_planes is always 1, do you need it at all? And if it is always one, why use _MPLANE at all? Is this for future additions? > +}; > + > +static const struct venus_format *find_format(u32 pixfmt, u32 type) > +{ > + const struct venus_format *fmt = vdec_formats; > + unsigned int size = ARRAY_SIZE(vdec_formats); > + unsigned int i; > + > + for (i = 0; i < size; i++) { > + if (fmt[i].pixfmt == pixfmt) > + break; > + } > + > + if (i == size || fmt[i].type != type) > + return NULL; > + > + return &fmt[i]; > +} > + > +static const struct venus_format *find_format_by_index(int index, u32 type) > +{ > + const struct venus_format *fmt = vdec_formats; > + unsigned int size = ARRAY_SIZE(vdec_formats); > + int i, k = 0; > + > + if (index < 0 || index > size) > + return NULL; > + > + for (i = 0; i < size; i++) { > + if (fmt[i].type != type) > + continue; > + if (k == index) > + break; > + k++; > + } > + > + if (i == size) > + return NULL; > + > + return &fmt[i]; > +} > + > +static const struct venus_format * > +vdec_try_fmt_common(struct venus_inst *inst, struct v4l2_format *f) > +{ > + struct v4l2_pix_format_mplane *pixmp = &f->fmt.pix_mp; > + struct v4l2_plane_pix_format *pfmt = pixmp->plane_fmt; > + const struct venus_format *fmt; > + unsigned int p; > + > + memset(pfmt[0].reserved, 0, sizeof(pfmt[0].reserved)); > + memset(pixmp->reserved, 0, sizeof(pixmp->reserved)); > + > + fmt = find_format(pixmp->pixelformat, f->type); > + if (!fmt) { > + if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) > + pixmp->pixelformat = V4L2_PIX_FMT_NV12; > + else if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) > + pixmp->pixelformat = V4L2_PIX_FMT_H264; > + else > + return NULL; > + fmt = find_format(pixmp->pixelformat, f->type); > + pixmp->width = 1280; > + pixmp->height = 720; > + } > + > + pixmp->width = clamp(pixmp->width, inst->cap_width.min, > + inst->cap_width.max); > + pixmp->height = clamp(pixmp->height, inst->cap_height.min, > + inst->cap_height.max); > + > + if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) > + pixmp->height = ALIGN(pixmp->height, 32); > + > + if (pixmp->field == V4L2_FIELD_ANY) > + pixmp->field = V4L2_FIELD_NONE; > + pixmp->num_planes = fmt->num_planes; > + pixmp->flags = 0; > + > + if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { > + for (p = 0; p < pixmp->num_planes; p++) { > + pfmt[p].sizeimage = > + get_framesize_uncompressed(p, pixmp->width, > + pixmp->height); > + pfmt[p].bytesperline = ALIGN(pixmp->width, 128); > + } > + } else { > + pfmt[0].sizeimage = get_framesize_compressed(pixmp->width, > + pixmp->height); > + pfmt[0].bytesperline = 0; > + } > + > + return fmt; > +} > + > +static int vdec_try_fmt(struct file *file, void *fh, struct v4l2_format *f) > +{ > + struct venus_inst *inst = to_inst(file); > + > + vdec_try_fmt_common(inst, f); > + > + return 0; > +} > + > +static int vdec_g_fmt(struct file *file, void *fh, struct v4l2_format *f) > +{ > + struct venus_inst *inst = to_inst(file); > + const struct venus_format *fmt = NULL; > + struct v4l2_pix_format_mplane *pixmp = &f->fmt.pix_mp; > + > + if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) > + fmt = inst->fmt_cap; > + else if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) > + fmt = inst->fmt_out; > + > + if (inst->reconfig) { > + struct v4l2_format format = {}; > + > + inst->out_width = inst->reconfig_width; > + inst->out_height = inst->reconfig_height; > + inst->reconfig = false; > + > + format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; > + format.fmt.pix_mp.pixelformat = inst->fmt_cap->pixfmt; > + format.fmt.pix_mp.width = inst->out_width; > + format.fmt.pix_mp.height = inst->out_height; > + > + vdec_try_fmt_common(inst, &format); > + > + inst->width = format.fmt.pix_mp.width; > + inst->height = format.fmt.pix_mp.height; > + } > + > + pixmp->pixelformat = fmt->pixfmt; > + > + if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { > + pixmp->width = inst->width; > + pixmp->height = inst->height; > + pixmp->colorspace = inst->colorspace; > + pixmp->ycbcr_enc = inst->ycbcr_enc; > + pixmp->quantization = inst->quantization; > + pixmp->xfer_func = inst->xfer_func; > + } else if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { > + pixmp->width = inst->out_width; > + pixmp->height = inst->out_height; > + } > + > + vdec_try_fmt_common(inst, f); > + > + return 0; > +} > + > +static int vdec_s_fmt(struct file *file, void *fh, struct v4l2_format *f) > +{ > + struct venus_inst *inst = to_inst(file); > + struct v4l2_pix_format_mplane *pixmp = &f->fmt.pix_mp; > + struct v4l2_pix_format_mplane orig_pixmp; > + const struct venus_format *fmt; > + struct v4l2_format format; > + u32 pixfmt_out = 0, pixfmt_cap = 0; > + > + orig_pixmp = *pixmp; > + > + fmt = vdec_try_fmt_common(inst, f); > + > + if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { > + pixfmt_out = pixmp->pixelformat; > + pixfmt_cap = inst->fmt_cap->pixfmt; > + } else if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { > + pixfmt_cap = pixmp->pixelformat; > + pixfmt_out = inst->fmt_out->pixfmt; > + } > + > + memset(&format, 0, sizeof(format)); > + > + format.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE; > + format.fmt.pix_mp.pixelformat = pixfmt_out; > + format.fmt.pix_mp.width = orig_pixmp.width; > + format.fmt.pix_mp.height = orig_pixmp.height; > + vdec_try_fmt_common(inst, &format); > + > + if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { > + inst->out_width = format.fmt.pix_mp.width; > + inst->out_height = format.fmt.pix_mp.height; > + inst->colorspace = pixmp->colorspace; > + inst->ycbcr_enc = pixmp->ycbcr_enc; > + inst->quantization = pixmp->quantization; > + inst->xfer_func = pixmp->xfer_func; > + } > + > + memset(&format, 0, sizeof(format)); > + > + format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; > + format.fmt.pix_mp.pixelformat = pixfmt_cap; > + format.fmt.pix_mp.width = orig_pixmp.width; > + format.fmt.pix_mp.height = orig_pixmp.height; > + vdec_try_fmt_common(inst, &format); > + > + inst->width = format.fmt.pix_mp.width; > + inst->height = format.fmt.pix_mp.height; > + > + if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) > + inst->fmt_out = fmt; > + else if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) > + inst->fmt_cap = fmt; > + > + return 0; > +} > + > +static int > +vdec_g_selection(struct file *file, void *fh, struct v4l2_selection *s) > +{ > + struct venus_inst *inst = to_inst(file); > + > + if (s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE && > + s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) > + return -EINVAL; > + > + switch (s->target) { > + case V4L2_SEL_TGT_CROP_BOUNDS: > + case V4L2_SEL_TGT_CROP_DEFAULT: > + case V4L2_SEL_TGT_CROP: > + if (s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) > + return -EINVAL; > + s->r.width = inst->out_width; > + s->r.height = inst->out_height; > + break; > + case V4L2_SEL_TGT_COMPOSE_BOUNDS: > + case V4L2_SEL_TGT_COMPOSE_PADDED: > + if (s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) > + return -EINVAL; > + s->r.width = inst->width; > + s->r.height = inst->height; > + break; > + case V4L2_SEL_TGT_COMPOSE_DEFAULT: > + case V4L2_SEL_TGT_COMPOSE: > + if (s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) > + return -EINVAL; > + s->r.width = inst->out_width; > + s->r.height = inst->out_height; > + break; > + default: > + return -EINVAL; > + } > + > + s->r.top = 0; > + s->r.left = 0; > + > + return 0; > +} > + > +static int > +vdec_querycap(struct file *file, void *fh, struct v4l2_capability *cap) > +{ > + strlcpy(cap->driver, "qcom-venus", sizeof(cap->driver)); > + strlcpy(cap->card, "Qualcomm Venus video decoder", sizeof(cap->card)); > + strlcpy(cap->bus_info, "platform:qcom-venus", sizeof(cap->bus_info)); > + > + return 0; > +} > + > +static int vdec_enum_fmt(struct file *file, void *fh, struct v4l2_fmtdesc *f) > +{ > + const struct venus_format *fmt; > + > + memset(f->reserved, 0, sizeof(f->reserved)); > + > + fmt = find_format_by_index(f->index, f->type); > + if (!fmt) > + return -EINVAL; > + > + f->pixelformat = fmt->pixfmt; > + > + return 0; > +} > + > +static int vdec_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a) > +{ > + struct venus_inst *inst = to_inst(file); > + struct v4l2_captureparm *cap = &a->parm.capture; > + struct v4l2_fract *timeperframe = &cap->timeperframe; > + u64 us_per_frame, fps; > + > + if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE && > + a->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) > + return -EINVAL; > + > + memset(cap->reserved, 0, sizeof(cap->reserved)); > + if (!timeperframe->denominator) > + timeperframe->denominator = inst->timeperframe.denominator; > + if (!timeperframe->numerator) > + timeperframe->numerator = inst->timeperframe.numerator; > + cap->readbuffers = 0; > + cap->extendedmode = 0; > + cap->capability = V4L2_CAP_TIMEPERFRAME; > + us_per_frame = timeperframe->numerator * (u64)USEC_PER_SEC; > + do_div(us_per_frame, timeperframe->denominator); > + > + if (!us_per_frame) > + return -EINVAL; > + > + fps = (u64)USEC_PER_SEC; > + do_div(fps, us_per_frame); > + > + inst->fps = fps; > + inst->timeperframe = *timeperframe; > + > + return 0; > +} > + > +static int vdec_enum_framesizes(struct file *file, void *fh, > + struct v4l2_frmsizeenum *fsize) > +{ > + struct venus_inst *inst = to_inst(file); > + const struct venus_format *fmt; > + > + fmt = find_format(fsize->pixel_format, > + V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE); > + if (!fmt) { > + fmt = find_format(fsize->pixel_format, > + V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE); > + if (!fmt) > + return -EINVAL; > + } > + > + if (fsize->index) > + return -EINVAL; > + > + fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE; > + > + fsize->stepwise.min_width = inst->cap_width.min; > + fsize->stepwise.max_width = inst->cap_width.max; > + fsize->stepwise.step_width = inst->cap_width.step_size; > + fsize->stepwise.min_height = inst->cap_height.min; > + fsize->stepwise.max_height = inst->cap_height.max; > + fsize->stepwise.step_height = inst->cap_height.step_size; > + > + return 0; > +} > + > +static int vdec_subscribe_event(struct v4l2_fh *fh, > + const struct v4l2_event_subscription *sub) > +{ > + switch (sub->type) { > + case V4L2_EVENT_EOS: > + return v4l2_event_subscribe(fh, sub, 2, NULL); > + case V4L2_EVENT_SOURCE_CHANGE: > + return v4l2_src_change_event_subscribe(fh, sub); > + case V4L2_EVENT_CTRL: > + return v4l2_ctrl_subscribe_event(fh, sub); > + default: > + return -EINVAL; > + } > +} > + > +static const struct v4l2_ioctl_ops vdec_ioctl_ops = { > + .vidioc_querycap = vdec_querycap, > + .vidioc_enum_fmt_vid_cap_mplane = vdec_enum_fmt, > + .vidioc_enum_fmt_vid_out_mplane = vdec_enum_fmt, > + .vidioc_s_fmt_vid_cap_mplane = vdec_s_fmt, > + .vidioc_s_fmt_vid_out_mplane = vdec_s_fmt, > + .vidioc_g_fmt_vid_cap_mplane = vdec_g_fmt, > + .vidioc_g_fmt_vid_out_mplane = vdec_g_fmt, > + .vidioc_try_fmt_vid_cap_mplane = vdec_try_fmt, > + .vidioc_try_fmt_vid_out_mplane = vdec_try_fmt, > + .vidioc_g_selection = vdec_g_selection, > + .vidioc_reqbufs = v4l2_m2m_ioctl_reqbufs, > + .vidioc_querybuf = v4l2_m2m_ioctl_querybuf, > + .vidioc_create_bufs = v4l2_m2m_ioctl_create_bufs, > + .vidioc_prepare_buf = v4l2_m2m_ioctl_prepare_buf, > + .vidioc_qbuf = v4l2_m2m_ioctl_qbuf, > + .vidioc_expbuf = v4l2_m2m_ioctl_expbuf, > + .vidioc_dqbuf = v4l2_m2m_ioctl_dqbuf, > + .vidioc_streamon = v4l2_m2m_ioctl_streamon, > + .vidioc_streamoff = v4l2_m2m_ioctl_streamoff, > + .vidioc_s_parm = vdec_s_parm, > + .vidioc_enum_framesizes = vdec_enum_framesizes, > + .vidioc_subscribe_event = vdec_subscribe_event, > + .vidioc_unsubscribe_event = v4l2_event_unsubscribe, > +}; > + > +static int vdec_set_properties(struct venus_inst *inst) > +{ > + struct vdec_controls *ctr = &inst->controls.dec; > + struct venus_core *core = inst->core; > + struct hfi_enable en = { .enable = 1 }; > + u32 ptype; > + int ret; > + > + ptype = HFI_PROPERTY_PARAM_VDEC_CONTINUE_DATA_TRANSFER; > + ret = hfi_session_set_property(inst, ptype, &en); > + if (ret) > + return ret; > + > + if (core->res->hfi_version == HFI_VERSION_3XX) { > + struct hfi_buffer_alloc_mode mode; > + > + ptype = HFI_PROPERTY_PARAM_BUFFER_ALLOC_MODE; > + mode.type = HFI_BUFFER_OUTPUT; > + mode.mode = HFI_BUFFER_MODE_DYNAMIC; > + > + ret = hfi_session_set_property(inst, ptype, &mode); > + if (ret) > + return ret; > + } > + > + if (ctr->post_loop_deb_mode) { > + ptype = HFI_PROPERTY_CONFIG_VDEC_POST_LOOP_DEBLOCKER; > + en.enable = 1; > + ret = hfi_session_set_property(inst, ptype, &en); > + if (ret) > + return ret; > + } > + > + return 0; > +} > + > +static int vdec_init_session(struct venus_inst *inst) > +{ > + int ret; > + > + ret = hfi_session_init(inst, inst->fmt_out->pixfmt); > + if (ret) > + return ret; > + > + ret = helper_set_input_resolution(inst, inst->out_width, > + inst->out_height); > + if (ret) > + goto deinit; > + > + ret = helper_set_color_format(inst, inst->fmt_cap->pixfmt); > + if (ret) > + goto deinit; > + > + return 0; > +deinit: > + hfi_session_deinit(inst); > + return ret; > +} > + > +static int vdec_cap_num_buffers(struct venus_inst *inst, unsigned int *num) > +{ > + struct hfi_buffer_requirements bufreq; > + int ret; > + > + ret = vdec_init_session(inst); > + if (ret) > + return ret; > + > + ret = helper_get_bufreq(inst, HFI_BUFFER_OUTPUT, &bufreq); > + > + *num = bufreq.count_actual; > + > + hfi_session_deinit(inst); > + > + return ret; > +} > + > +static int vdec_queue_setup(struct vb2_queue *q, > + unsigned int *num_buffers, unsigned int *num_planes, > + unsigned int sizes[], struct device *alloc_devs[]) > +{ > + struct venus_inst *inst = vb2_get_drv_priv(q); > + unsigned int p, num; > + int ret = 0; > + > + if (*num_planes) { > + if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE && > + *num_planes != inst->fmt_out->num_planes) > + return -EINVAL; > + > + if (q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE && > + *num_planes != inst->fmt_cap->num_planes) > + return -EINVAL; > + > + if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE && > + sizes[0] < inst->input_buf_size) > + return -EINVAL; > + > + if (q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE && > + sizes[0] < inst->output_buf_size) > + return -EINVAL; > + > + if (inst->core->res->hfi_version == HFI_VERSION_LEGACY) > + return -EINVAL; > + > + return 0; > + } > + > + switch (q->type) { > + case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE: > + *num_planes = inst->fmt_out->num_planes; > + sizes[0] = get_framesize_compressed(inst->out_width, > + inst->out_height); > + inst->input_buf_size = sizes[0]; > + inst->num_input_bufs = *num_buffers; > + break; > + case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE: > + *num_planes = inst->fmt_cap->num_planes; > + > + ret = vdec_cap_num_buffers(inst, &num); > + if (ret) > + break; > + > + *num_buffers = max(*num_buffers, num); > + > + for (p = 0; p < *num_planes; p++) > + sizes[p] = get_framesize_uncompressed(p, inst->width, > + inst->height); > + > + inst->num_output_bufs = *num_buffers; > + inst->output_buf_size = sizes[0]; > + break; > + default: > + ret = -EINVAL; > + break; > + } > + > + return ret; > +} > + > +static int vdec_verify_conf(struct venus_inst *inst) > +{ > + struct hfi_buffer_requirements bufreq; > + int ret; > + > + if (!inst->num_input_bufs || !inst->num_output_bufs) > + return -EINVAL; > + > + ret = helper_get_bufreq(inst, HFI_BUFFER_OUTPUT, &bufreq); > + if (ret) > + return ret; > + > + if (inst->num_output_bufs < bufreq.count_actual || > + inst->num_output_bufs < bufreq.count_min) > + return -EINVAL; > + > + ret = helper_get_bufreq(inst, HFI_BUFFER_INPUT, &bufreq); > + if (ret) > + return ret; > + > + if (inst->num_input_bufs < bufreq.count_min) > + return -EINVAL; > + > + return 0; > +} > + > +static int vdec_start_streaming(struct vb2_queue *q, unsigned int count) > +{ > + struct venus_inst *inst = vb2_get_drv_priv(q); > + struct venus_core *core = inst->core; > + u32 ptype; > + int ret; > + > + mutex_lock(&inst->lock); > + > + if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) > + inst->streamon_out = 1; > + else > + inst->streamon_cap = 1; > + > + if (!(inst->streamon_out & inst->streamon_cap)) { > + mutex_unlock(&inst->lock); > + return 0; > + } > + > + inst->reconfig = false; > + inst->sequence = 0; > + inst->codec_cfg = false; > + > + ret = vdec_init_session(inst); > + if (ret) > + goto bufs_done; > + > + ret = vdec_set_properties(inst); > + if (ret) > + goto deinit_sess; > + > + if (core->res->hfi_version == HFI_VERSION_3XX) { > + struct hfi_buffer_size_actual buf_sz; > + > + ptype = HFI_PROPERTY_PARAM_BUFFER_SIZE_ACTUAL; > + buf_sz.type = HFI_BUFFER_OUTPUT; > + buf_sz.size = inst->output_buf_size; > + > + ret = hfi_session_set_property(inst, ptype, &buf_sz); > + if (ret) > + goto deinit_sess; > + } > + > + ret = vdec_verify_conf(inst); > + if (ret) > + goto deinit_sess; > + > + ret = helper_set_num_bufs(inst, inst->num_input_bufs, > + inst->num_output_bufs); > + if (ret) > + goto deinit_sess; > + > + ret = helper_vb2_start_streaming(inst); > + if (ret) > + goto deinit_sess; > + > + mutex_unlock(&inst->lock); > + > + return 0; > + > +deinit_sess: > + hfi_session_deinit(inst); > +bufs_done: > + helper_buffers_done(inst, VB2_BUF_STATE_QUEUED); > + if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) > + inst->streamon_out = 0; > + else > + inst->streamon_cap = 0; > + mutex_unlock(&inst->lock); > + return ret; > +} > + > +static const struct vb2_ops vdec_vb2_ops = { > + .queue_setup = vdec_queue_setup, > + .buf_init = helper_vb2_buf_init, > + .buf_prepare = helper_vb2_buf_prepare, > + .start_streaming = vdec_start_streaming, > + .stop_streaming = helper_vb2_stop_streaming, > + .buf_queue = helper_vb2_buf_queue, > +}; > + > +static void vdec_buf_done(struct venus_inst *inst, unsigned int buf_type, > + u32 tag, u32 bytesused, u32 data_offset, u32 flags, > + u64 timestamp_us) > +{ > + struct vb2_v4l2_buffer *vbuf; > + struct vb2_buffer *vb; > + unsigned int type; > + > + if (buf_type == HFI_BUFFER_INPUT) > + type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE; > + else > + type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; > + > + vbuf = helper_find_buf(inst, type, tag); > + if (!vbuf) > + return; > + > + vbuf->flags = flags; > + > + if (type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { > + vb = &vbuf->vb2_buf; > + vb->planes[0].bytesused = > + max_t(unsigned int, inst->output_buf_size, bytesused); > + vb->planes[0].data_offset = data_offset; > + vb->timestamp = timestamp_us * NSEC_PER_USEC; > + vbuf->sequence = inst->sequence++; timestamp and sequence are only set for CAPTURE, not OUTPUT. Is that correct? > + > + if (vbuf->flags & V4L2_BUF_FLAG_LAST) { > + const struct v4l2_event ev = { .type = V4L2_EVENT_EOS }; > + > + v4l2_event_queue_fh(&inst->fh, &ev); > + } > + } > + > + v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_DONE); > +} > + > +static void vdec_event_notify(struct venus_inst *inst, u32 event, > + struct hfi_event_data *data) > +{ > + struct venus_core *core = inst->core; > + struct device *dev = core->dev_dec; > + static const struct v4l2_event ev = { > + .type = V4L2_EVENT_SOURCE_CHANGE, > + .u.src_change.changes = V4L2_EVENT_SRC_CH_RESOLUTION }; > + > + switch (event) { > + case EVT_SESSION_ERROR: > + inst->session_error = true; > + dev_err(dev, "dec: event session error %x\n", inst->error); > + break; > + case EVT_SYS_EVENT_CHANGE: > + switch (data->event_type) { > + case HFI_EVENT_DATA_SEQUENCE_CHANGED_SUFFICIENT_BUF_RESOURCES: > + hfi_session_continue(inst); > + dev_dbg(dev, "event sufficient resources\n"); > + break; > + case HFI_EVENT_DATA_SEQUENCE_CHANGED_INSUFFICIENT_BUF_RESOURCES: > + inst->reconfig_height = data->height; > + inst->reconfig_width = data->width; > + inst->reconfig = true; > + > + v4l2_event_queue_fh(&inst->fh, &ev); > + > + dev_dbg(dev, "event not sufficient resources (%ux%u)\n", > + data->width, data->height); > + break; > + default: > + break; > + } > + break; > + default: > + break; > + } > +} > + > +static const struct hfi_inst_ops vdec_hfi_ops = { > + .buf_done = vdec_buf_done, > + .event_notify = vdec_event_notify, > +}; > + > +static void vdec_inst_init(struct venus_inst *inst) > +{ > + inst->fmt_out = &vdec_formats[6]; > + inst->fmt_cap = &vdec_formats[0]; > + inst->width = 1280; > + inst->height = ALIGN(720, 32); > + inst->out_width = 1280; > + inst->out_height = 720; > + inst->fps = 30; > + inst->timeperframe.numerator = 1; > + inst->timeperframe.denominator = 30; > + > + inst->cap_width.min = 64; > + if (inst->core->res->hfi_version == HFI_VERSION_LEGACY) > + inst->cap_width.max = 1920; > + else > + inst->cap_width.max = 3840; > + inst->cap_width.step_size = 1; > + inst->cap_height.min = 64; > + if (inst->core->res->hfi_version == HFI_VERSION_LEGACY) > + inst->cap_height.max = ALIGN(1080, 32); > + else > + inst->cap_height.max = ALIGN(2160, 32); > + inst->cap_height.step_size = 1; > + inst->cap_framerate.min = 1; > + inst->cap_framerate.max = 30; > + inst->cap_framerate.step_size = 1; > + inst->cap_mbs_per_frame.min = 16; > + inst->cap_mbs_per_frame.max = 8160; > +} > + > +static const struct v4l2_m2m_ops vdec_m2m_ops = { > + .device_run = helper_m2m_device_run, > + .job_abort = helper_m2m_job_abort, > +}; > + > +static int m2m_queue_init(void *priv, struct vb2_queue *src_vq, > + struct vb2_queue *dst_vq) > +{ > + struct venus_inst *inst = priv; > + int ret; > + > + src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE; > + src_vq->io_modes = VB2_MMAP | VB2_DMABUF; > + src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; > + src_vq->ops = &vdec_vb2_ops; > + src_vq->mem_ops = &vb2_dma_sg_memops; > + src_vq->drv_priv = inst; > + src_vq->buf_struct_size = sizeof(struct venus_buffer); > + src_vq->allow_zero_bytesused = 1; > + src_vq->min_buffers_needed = 1; > + src_vq->dev = inst->core->dev; > + ret = vb2_queue_init(src_vq); > + if (ret) > + return ret; > + > + dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; > + dst_vq->io_modes = VB2_MMAP | VB2_DMABUF; > + dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; > + dst_vq->ops = &vdec_vb2_ops; > + dst_vq->mem_ops = &vb2_dma_sg_memops; > + dst_vq->drv_priv = inst; > + dst_vq->buf_struct_size = sizeof(struct venus_buffer); > + dst_vq->allow_zero_bytesused = 1; > + dst_vq->min_buffers_needed = 1; > + dst_vq->dev = inst->core->dev; > + ret = vb2_queue_init(dst_vq); > + if (ret) { > + vb2_queue_release(src_vq); > + return ret; > + } > + > + return 0; > +} > + > +static int vdec_open(struct file *file) > +{ > + struct venus_core *core = video_drvdata(file); > + struct venus_inst *inst; > + int ret; > + > + inst = kzalloc(sizeof(*inst), GFP_KERNEL); > + if (!inst) > + return -ENOMEM; > + > + INIT_LIST_HEAD(&inst->registeredbufs); > + INIT_LIST_HEAD(&inst->internalbufs); > + INIT_LIST_HEAD(&inst->list); > + mutex_init(&inst->lock); > + > + inst->core = core; > + inst->session_type = VIDC_SESSION_TYPE_DEC; > + > + ret = pm_runtime_get_sync(core->dev_dec); > + if (ret < 0) > + goto err_free_inst; > + > + ret = vdec_ctrl_init(inst); > + if (ret) > + goto err_put_sync; > + > + ret = hfi_session_create(inst, &vdec_hfi_ops); > + if (ret) > + goto err_ctrl_deinit; > + > + vdec_inst_init(inst); > + > + /* > + * create m2m device for every instance, the m2m context scheduling > + * is made by firmware side so we do not need to care about. > + */ > + inst->m2m_dev = v4l2_m2m_init(&vdec_m2m_ops); > + if (IS_ERR(inst->m2m_dev)) { > + ret = PTR_ERR(inst->m2m_dev); > + goto err_session_destroy; > + } > + > + inst->m2m_ctx = v4l2_m2m_ctx_init(inst->m2m_dev, inst, m2m_queue_init); > + if (IS_ERR(inst->m2m_ctx)) { > + ret = PTR_ERR(inst->m2m_ctx); > + goto err_m2m_release; > + } > + > + v4l2_fh_init(&inst->fh, core->vdev_dec); > + > + inst->fh.ctrl_handler = &inst->ctrl_handler; > + v4l2_fh_add(&inst->fh); > + inst->fh.m2m_ctx = inst->m2m_ctx; > + file->private_data = &inst->fh; > + > + return 0; > + > +err_m2m_release: > + v4l2_m2m_release(inst->m2m_dev); > +err_session_destroy: > + hfi_session_destroy(inst); > +err_ctrl_deinit: > + vdec_ctrl_deinit(inst); > +err_put_sync: > + pm_runtime_put_sync(core->dev_dec); > +err_free_inst: > + kfree(inst); > + return ret; > +} > + > +static int vdec_close(struct file *file) > +{ > + struct venus_inst *inst = to_inst(file); > + > + v4l2_m2m_ctx_release(inst->m2m_ctx); > + v4l2_m2m_release(inst->m2m_dev); > + vdec_ctrl_deinit(inst); > + hfi_session_destroy(inst); > + mutex_destroy(&inst->lock); > + v4l2_fh_del(&inst->fh); > + v4l2_fh_exit(&inst->fh); > + kfree(inst); > + > + pm_runtime_put_sync(inst->core->dev_dec); > + return 0; > +} > + > +static const struct v4l2_file_operations vdec_fops = { > + .owner = THIS_MODULE, > + .open = vdec_open, > + .release = vdec_close, > + .unlocked_ioctl = video_ioctl2, > + .poll = v4l2_m2m_fop_poll, > + .mmap = v4l2_m2m_fop_mmap, > +#ifdef CONFIG_COMPAT > + .compat_ioctl32 = v4l2_compat_ioctl32, > +#endif > +}; > + > +static int vdec_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct video_device *vdev; > + struct venus_core *core; > + int ret; > + > + if (!dev->parent) > + return -EPROBE_DEFER; > + > + core = dev_get_drvdata(dev->parent); > + if (!core) > + return -EPROBE_DEFER; > + > + if (core->res->hfi_version == HFI_VERSION_3XX) { > + core->core0_clk = devm_clk_get(dev, "core"); > + if (IS_ERR(core->core0_clk)) > + return PTR_ERR(core->core0_clk); > + } > + > + platform_set_drvdata(pdev, core); > + > + vdev = video_device_alloc(); > + if (!vdev) > + return -ENOMEM; > + > + vdev->release = video_device_release; > + vdev->fops = &vdec_fops; > + vdev->ioctl_ops = &vdec_ioctl_ops; > + vdev->vfl_dir = VFL_DIR_M2M; > + vdev->v4l2_dev = &core->v4l2_dev; > + vdev->device_caps = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING; > + > + ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1); > + if (ret) > + goto err_vdev_release; > + > + core->vdev_dec = vdev; > + core->dev_dec = dev; > + > + video_set_drvdata(vdev, core); > + pm_runtime_enable(dev); > + > + return 0; > + > +err_vdev_release: > + video_device_release(vdev); > + return ret; > +} > + > +static int vdec_remove(struct platform_device *pdev) > +{ > + struct venus_core *core = dev_get_drvdata(pdev->dev.parent); > + > + video_unregister_device(core->vdev_dec); > + pm_runtime_disable(core->dev_dec); > + > + return 0; > +} > + > +#ifdef CONFIG_PM > +static int vdec_runtime_suspend(struct device *dev) > +{ > + struct venus_core *core = dev_get_drvdata(dev); > + > + if (core->res->hfi_version == HFI_VERSION_LEGACY) > + return 0; > + > + writel(0, core->base + WRAPPER_VDEC_VCODEC_POWER_CONTROL); > + clk_disable_unprepare(core->core0_clk); > + writel(1, core->base + WRAPPER_VDEC_VCODEC_POWER_CONTROL); > + > + return 0; > +} > + > +static int vdec_runtime_resume(struct device *dev) > +{ > + struct venus_core *core = dev_get_drvdata(dev); > + int ret; > + > + if (core->res->hfi_version == HFI_VERSION_LEGACY) > + return 0; > + > + writel(0, core->base + WRAPPER_VDEC_VCODEC_POWER_CONTROL); > + ret = clk_prepare_enable(core->core0_clk); > + writel(1, core->base + WRAPPER_VDEC_VCODEC_POWER_CONTROL); > + > + return ret; > +} > +#endif > + > +static const struct dev_pm_ops vdec_pm_ops = { > + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, > + pm_runtime_force_resume) > + SET_RUNTIME_PM_OPS(vdec_runtime_suspend, vdec_runtime_resume, NULL) > +}; > + > +static const struct of_device_id vdec_dt_match[] = { > + { .compatible = "venus-decoder" }, > + { } > +}; > +MODULE_DEVICE_TABLE(of, vdec_dt_match); > + > +static struct platform_driver qcom_venus_dec_driver = { > + .probe = vdec_probe, > + .remove = vdec_remove, > + .driver = { > + .name = "qcom-venus-decoder", > + .of_match_table = vdec_dt_match, > + .pm = &vdec_pm_ops, > + }, > +}; > +module_platform_driver(qcom_venus_dec_driver); > + > +MODULE_ALIAS("platform:qcom-venus-decoder"); > +MODULE_DESCRIPTION("Qualcomm Venus video decoder driver"); > +MODULE_LICENSE("GPL v2"); > diff --git a/drivers/media/platform/qcom/venus/vdec.h b/drivers/media/platform/qcom/venus/vdec.h > new file mode 100644 > index 000000000000..84b672c54d02 > --- /dev/null > +++ b/drivers/media/platform/qcom/venus/vdec.h > @@ -0,0 +1,23 @@ > +/* > + * Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. > + * Copyright (C) 2017 Linaro Ltd. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 and > + * only version 2 as published by the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + */ > +#ifndef __VENUS_VDEC_H__ > +#define __VENUS_VDEC_H__ > + > +struct venus_inst; > + > +int vdec_ctrl_init(struct venus_inst *inst); > +void vdec_ctrl_deinit(struct venus_inst *inst); > + > +#endif > diff --git a/drivers/media/platform/qcom/venus/vdec_ctrls.c b/drivers/media/platform/qcom/venus/vdec_ctrls.c > new file mode 100644 > index 000000000000..c91e2ec37ea4 > --- /dev/null > +++ b/drivers/media/platform/qcom/venus/vdec_ctrls.c > @@ -0,0 +1,149 @@ > +/* > + * Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. > + * Copyright (C) 2017 Linaro Ltd. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 and > + * only version 2 as published by the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + */ > +#include <linux/types.h> > +#include <media/v4l2-ctrls.h> > + > +#include "core.h" > + > +static int vdec_op_s_ctrl(struct v4l2_ctrl *ctrl) > +{ > + struct venus_inst *inst = ctrl_to_inst(ctrl); > + struct vdec_controls *ctr = &inst->controls.dec; > + > + switch (ctrl->id) { > + case V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER: > + ctr->post_loop_deb_mode = ctrl->val; > + break; > + case V4L2_CID_MPEG_VIDEO_H264_PROFILE: > + case V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE: > + case V4L2_CID_MPEG_VIDEO_VPX_PROFILE: > + ctr->profile = ctrl->val; > + break; > + case V4L2_CID_MPEG_VIDEO_H264_LEVEL: > + case V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL: > + ctr->level = ctrl->val; > + break; > + default: > + return -EINVAL; > + } > + > + return 0; > +} > + > +static int vdec_op_g_volatile_ctrl(struct v4l2_ctrl *ctrl) > +{ > + struct venus_inst *inst = ctrl_to_inst(ctrl); > + struct vdec_controls *ctr = &inst->controls.dec; > + union hfi_get_property hprop; > + u32 ptype = HFI_PROPERTY_PARAM_PROFILE_LEVEL_CURRENT; > + int ret; > + > + switch (ctrl->id) { > + case V4L2_CID_MPEG_VIDEO_H264_PROFILE: > + case V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE: > + case V4L2_CID_MPEG_VIDEO_VPX_PROFILE: > + ret = hfi_session_get_property(inst, ptype, &hprop); > + if (!ret) > + ctr->profile = hprop.profile_level.profile; > + ctrl->val = ctr->profile; > + break; > + case V4L2_CID_MPEG_VIDEO_H264_LEVEL: > + case V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL: > + ret = hfi_session_get_property(inst, ptype, &hprop); > + if (!ret) > + ctr->level = hprop.profile_level.level; > + ctrl->val = ctr->level; > + break; > + case V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER: > + ctrl->val = ctr->post_loop_deb_mode; > + break; > + default: > + return -EINVAL; > + }; > + > + return 0; > +} > + > +static const struct v4l2_ctrl_ops vdec_ctrl_ops = { > + .s_ctrl = vdec_op_s_ctrl, > + .g_volatile_ctrl = vdec_op_g_volatile_ctrl, > +}; > + > +int vdec_ctrl_init(struct venus_inst *inst) > +{ > + struct v4l2_ctrl *ctrl; > + int ret; > + > + ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 6); > + if (ret) > + return ret; > + > + ctrl = v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &vdec_ctrl_ops, > + V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE, > + V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_CODING_EFFICIENCY, > + ~((1 << V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE) | > + (1 << V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_SIMPLE)), > + V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE); > + if (ctrl) > + ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE; > + > + ctrl = v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &vdec_ctrl_ops, > + V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL, > + V4L2_MPEG_VIDEO_MPEG4_LEVEL_5, > + 0, V4L2_MPEG_VIDEO_MPEG4_LEVEL_0); > + if (ctrl) > + ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE; > + > + ctrl = v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &vdec_ctrl_ops, > + V4L2_CID_MPEG_VIDEO_H264_PROFILE, > + V4L2_MPEG_VIDEO_H264_PROFILE_MULTIVIEW_HIGH, > + ~((1 << V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE) | > + (1 << V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE) | > + (1 << V4L2_MPEG_VIDEO_H264_PROFILE_MAIN) | > + (1 << V4L2_MPEG_VIDEO_H264_PROFILE_HIGH) | > + (1 << V4L2_MPEG_VIDEO_H264_PROFILE_STEREO_HIGH) | > + (1 << V4L2_MPEG_VIDEO_H264_PROFILE_MULTIVIEW_HIGH)), > + V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE); > + if (ctrl) > + ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE; > + > + ctrl = v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &vdec_ctrl_ops, > + V4L2_CID_MPEG_VIDEO_H264_LEVEL, > + V4L2_MPEG_VIDEO_H264_LEVEL_5_1, > + 0, V4L2_MPEG_VIDEO_H264_LEVEL_1_0); > + if (ctrl) > + ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE; > + > + ctrl = v4l2_ctrl_new_std(&inst->ctrl_handler, &vdec_ctrl_ops, > + V4L2_CID_MPEG_VIDEO_VPX_PROFILE, 0, 3, 1, 0); > + if (ctrl) > + ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE; > + > + v4l2_ctrl_new_std(&inst->ctrl_handler, &vdec_ctrl_ops, > + V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER, 0, 1, 1, 0); > + > + ret = inst->ctrl_handler.error; > + if (ret) { > + v4l2_ctrl_handler_free(&inst->ctrl_handler); > + return ret; > + } > + > + return 0; > +} > + > +void vdec_ctrl_deinit(struct venus_inst *inst) > +{ > + v4l2_ctrl_handler_free(&inst->ctrl_handler); > +} > Regards, Hans
Le vendredi 24 mars 2017 à 15:41 +0100, Hans Verkuil a écrit : > > +static const struct venus_format vdec_formats[] = { > > +     { > > +             .pixfmt = V4L2_PIX_FMT_NV12, > > +             .num_planes = 1, > > +             .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, > > Just curious: is NV12 the only uncompressed format supported by the > hardware? > Or just the only one that is implemented here? The downstream kernel[0], from Qualcomm have: {                 .name = "UBWC YCbCr Semiplanar 4:2:0",                 .description = "UBWC Y/CbCr 4:2:0",                 .fourcc = V4L2_PIX_FMT_NV12_UBWC,                 .num_planes = 2,                 .get_frame_size = get_frame_size_nv12_ubwc,                 .type = CAPTURE_PORT,         },         {                 .name = "UBWC YCbCr Semiplanar 4:2:0 10bit",                 .description = "UBWC Y/CbCr 4:2:0 10bit",                 .fourcc = V4L2_PIX_FMT_NV12_TP10_UBWC,                 .num_planes = 2,                 .get_frame_size = get_frame_size_nv12_ubwc_10bit,                 .type = CAPTURE_PORT,         }, I have no idea what UBWC stands for. The performance in NV12 is more then decent from my testing. Though, there is no 10bit variant. regards, Nicolas [0] https://android.googlesource.com/kernel/msm/+/android-7.1.0_r0.2/dr ivers/media/platform/msm/vidc/msm_vdec.c#695
Thanks for the comments! On 03/24/2017 04:41 PM, Hans Verkuil wrote: > Some comments and questions below: > > On 03/13/17 17:37, Stanimir Varbanov wrote: >> This consists of video decoder implementation plus decoder >> controls. >> >> Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org> >> --- >> drivers/media/platform/qcom/venus/vdec.c | 1091 ++++++++++++++++++++++++ >> drivers/media/platform/qcom/venus/vdec.h | 23 + >> drivers/media/platform/qcom/venus/vdec_ctrls.c | 149 ++++ >> 3 files changed, 1263 insertions(+) >> create mode 100644 drivers/media/platform/qcom/venus/vdec.c >> create mode 100644 drivers/media/platform/qcom/venus/vdec.h >> create mode 100644 drivers/media/platform/qcom/venus/vdec_ctrls.c >> >> diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c >> new file mode 100644 >> index 000000000000..ec5203f2ba81 >> --- /dev/null >> +++ b/drivers/media/platform/qcom/venus/vdec.c >> @@ -0,0 +1,1091 @@ >> +/* >> + * Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. >> + * Copyright (C) 2017 Linaro Ltd. >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License version 2 and >> + * only version 2 as published by the Free Software Foundation. >> + * >> + * This program is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + * >> + */ >> +#include <linux/clk.h> >> +#include <linux/module.h> >> +#include <linux/platform_device.h> >> +#include <linux/pm_runtime.h> >> +#include <linux/slab.h> >> +#include <media/v4l2-ioctl.h> >> +#include <media/v4l2-event.h> >> +#include <media/v4l2-ctrls.h> >> +#include <media/v4l2-mem2mem.h> >> +#include <media/videobuf2-dma-sg.h> >> + >> +#include "hfi_venus_io.h" >> +#include "core.h" >> +#include "helpers.h" >> +#include "vdec.h" >> + >> +static u32 get_framesize_uncompressed(unsigned int plane, u32 width, u32 height) >> +{ >> + u32 y_stride, uv_stride, y_plane; >> + u32 y_sclines, uv_sclines, uv_plane; >> + u32 size; >> + >> + y_stride = ALIGN(width, 128); >> + uv_stride = ALIGN(width, 128); >> + y_sclines = ALIGN(height, 32); >> + uv_sclines = ALIGN(((height + 1) >> 1), 16); >> + >> + y_plane = y_stride * y_sclines; >> + uv_plane = uv_stride * uv_sclines + SZ_4K; >> + size = y_plane + uv_plane + SZ_8K; >> + >> + return ALIGN(size, SZ_4K); >> +} >> + >> +static u32 get_framesize_compressed(unsigned int width, unsigned int height) >> +{ >> + return ((width * height * 3 / 2) / 2) + 128; >> +} >> + >> +static const struct venus_format vdec_formats[] = { >> + { >> + .pixfmt = V4L2_PIX_FMT_NV12, >> + .num_planes = 1, >> + .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, > > Just curious: is NV12 the only uncompressed format supported by the hardware? > Or just the only one that is implemented here? > >> + }, { >> + .pixfmt = V4L2_PIX_FMT_MPEG4, >> + .num_planes = 1, >> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >> + }, { >> + .pixfmt = V4L2_PIX_FMT_MPEG2, >> + .num_planes = 1, >> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >> + }, { >> + .pixfmt = V4L2_PIX_FMT_H263, >> + .num_planes = 1, >> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >> + }, { >> + .pixfmt = V4L2_PIX_FMT_VC1_ANNEX_G, >> + .num_planes = 1, >> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >> + }, { >> + .pixfmt = V4L2_PIX_FMT_VC1_ANNEX_L, >> + .num_planes = 1, >> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >> + }, { >> + .pixfmt = V4L2_PIX_FMT_H264, >> + .num_planes = 1, >> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >> + }, { >> + .pixfmt = V4L2_PIX_FMT_VP8, >> + .num_planes = 1, >> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >> + }, { >> + .pixfmt = V4L2_PIX_FMT_XVID, >> + .num_planes = 1, >> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >> + }, > > num_planes is always 1, do you need it at all? And if it is always one, > why use _MPLANE at all? Is this for future additions? > >> +}; >> + <snip> three reasons: - _MPLAIN allows one plane only - downstream qualcomm driver use _MPLAIN (the second plain is used for extaradata, I ignored the extaradata support for now until v4l2 metadata api is merged) - I still believe that qualcomm firmware guys will add support the second or even third plain at some point. >> + >> +static void vdec_buf_done(struct venus_inst *inst, unsigned int buf_type, >> + u32 tag, u32 bytesused, u32 data_offset, u32 flags, >> + u64 timestamp_us) >> +{ >> + struct vb2_v4l2_buffer *vbuf; >> + struct vb2_buffer *vb; >> + unsigned int type; >> + >> + if (buf_type == HFI_BUFFER_INPUT) >> + type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE; >> + else >> + type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; >> + >> + vbuf = helper_find_buf(inst, type, tag); >> + if (!vbuf) >> + return; >> + >> + vbuf->flags = flags; >> + >> + if (type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { >> + vb = &vbuf->vb2_buf; >> + vb->planes[0].bytesused = >> + max_t(unsigned int, inst->output_buf_size, bytesused); >> + vb->planes[0].data_offset = data_offset; >> + vb->timestamp = timestamp_us * NSEC_PER_USEC; >> + vbuf->sequence = inst->sequence++; > > timestamp and sequence are only set for CAPTURE, not OUTPUT. Is that correct? Correct. I can add sequence for the OUTPUT queue too, but I have no idea how that sequence is used by userspace. > >> + >> + if (vbuf->flags & V4L2_BUF_FLAG_LAST) { >> + const struct v4l2_event ev = { .type = V4L2_EVENT_EOS }; >> + >> + v4l2_event_queue_fh(&inst->fh, &ev); >> + } >> + } >> + >> + v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_DONE); >> +} <snip>
Hi, On 24.03.2017 20:21, Nicolas Dufresne wrote: > Le vendredi 24 mars 2017 à 15:41 +0100, Hans Verkuil a écrit : >>> +static const struct venus_format vdec_formats[] = { >>> + { >>> + .pixfmt = V4L2_PIX_FMT_NV12, >>> + .num_planes = 1, >>> + .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, >> >> Just curious: is NV12 the only uncompressed format supported by the >> hardware? >> Or just the only one that is implemented here? yes, at least to my knowledge (except below UBWC). > > The downstream kernel[0], from Qualcomm have: > > { > .name = "UBWC YCbCr Semiplanar 4:2:0", > .description = "UBWC Y/CbCr 4:2:0", > .fourcc = V4L2_PIX_FMT_NV12_UBWC, > .num_planes = 2, > .get_frame_size = get_frame_size_nv12_ubwc, > .type = CAPTURE_PORT, > }, > { > .name = "UBWC YCbCr Semiplanar 4:2:0 10bit", > .description = "UBWC Y/CbCr 4:2:0 10bit", > .fourcc = V4L2_PIX_FMT_NV12_TP10_UBWC, > .num_planes = 2, > .get_frame_size = get_frame_size_nv12_ubwc_10bit, > .type = CAPTURE_PORT, > }, > > I have no idea what UBWC stands for. The performance in NV12 is more > then decent from my testing. Though, there is no 10bit variant. UBWC is some kind of compressed format for NV12 [1]. This format is applicable for the newer venus hardware revisions and I planed to add it later on (when Adreno GPU driver starts handle it). regards, Stan [1] https://android.googlesource.com/kernel/msm/+/android-7.1.0_r0.2/include/media/msm_media_info.h#151
Le dimanche 26 mars 2017 à 00:30 +0200, Stanimir Varbanov a écrit : > > > +            vb->planes[0].data_offset = data_offset; > > > +            vb->timestamp = timestamp_us * NSEC_PER_USEC; > > > +            vbuf->sequence = inst->sequence++; > > > > timestamp and sequence are only set for CAPTURE, not OUTPUT. Is > > that correct? > > Correct. I can add sequence for the OUTPUT queue too, but I have no idea > how that sequence is used by userspace. Neither GStreamer or Chromium seems to use it. What does that number means for a m2m driver ? Does it really means something ? Nicolas
On 25/03/17 23:30, Stanimir Varbanov wrote: > Thanks for the comments! > > On 03/24/2017 04:41 PM, Hans Verkuil wrote: >> Some comments and questions below: >> >> On 03/13/17 17:37, Stanimir Varbanov wrote: >>> This consists of video decoder implementation plus decoder >>> controls. >>> >>> Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org> >>> --- >>> drivers/media/platform/qcom/venus/vdec.c | 1091 ++++++++++++++++++++++++ >>> drivers/media/platform/qcom/venus/vdec.h | 23 + >>> drivers/media/platform/qcom/venus/vdec_ctrls.c | 149 ++++ >>> 3 files changed, 1263 insertions(+) >>> create mode 100644 drivers/media/platform/qcom/venus/vdec.c >>> create mode 100644 drivers/media/platform/qcom/venus/vdec.h >>> create mode 100644 drivers/media/platform/qcom/venus/vdec_ctrls.c >>> >>> diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c >>> new file mode 100644 >>> index 000000000000..ec5203f2ba81 >>> --- /dev/null >>> +++ b/drivers/media/platform/qcom/venus/vdec.c >>> @@ -0,0 +1,1091 @@ >>> +/* >>> + * Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. >>> + * Copyright (C) 2017 Linaro Ltd. >>> + * >>> + * This program is free software; you can redistribute it and/or modify >>> + * it under the terms of the GNU General Public License version 2 and >>> + * only version 2 as published by the Free Software Foundation. >>> + * >>> + * This program is distributed in the hope that it will be useful, >>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >>> + * GNU General Public License for more details. >>> + * >>> + */ >>> +#include <linux/clk.h> >>> +#include <linux/module.h> >>> +#include <linux/platform_device.h> >>> +#include <linux/pm_runtime.h> >>> +#include <linux/slab.h> >>> +#include <media/v4l2-ioctl.h> >>> +#include <media/v4l2-event.h> >>> +#include <media/v4l2-ctrls.h> >>> +#include <media/v4l2-mem2mem.h> >>> +#include <media/videobuf2-dma-sg.h> >>> + >>> +#include "hfi_venus_io.h" >>> +#include "core.h" >>> +#include "helpers.h" >>> +#include "vdec.h" >>> + >>> +static u32 get_framesize_uncompressed(unsigned int plane, u32 width, u32 height) >>> +{ >>> + u32 y_stride, uv_stride, y_plane; >>> + u32 y_sclines, uv_sclines, uv_plane; >>> + u32 size; >>> + >>> + y_stride = ALIGN(width, 128); >>> + uv_stride = ALIGN(width, 128); >>> + y_sclines = ALIGN(height, 32); >>> + uv_sclines = ALIGN(((height + 1) >> 1), 16); >>> + >>> + y_plane = y_stride * y_sclines; >>> + uv_plane = uv_stride * uv_sclines + SZ_4K; >>> + size = y_plane + uv_plane + SZ_8K; >>> + >>> + return ALIGN(size, SZ_4K); >>> +} >>> + >>> +static u32 get_framesize_compressed(unsigned int width, unsigned int height) >>> +{ >>> + return ((width * height * 3 / 2) / 2) + 128; >>> +} >>> + >>> +static const struct venus_format vdec_formats[] = { >>> + { >>> + .pixfmt = V4L2_PIX_FMT_NV12, >>> + .num_planes = 1, >>> + .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, >> >> Just curious: is NV12 the only uncompressed format supported by the hardware? >> Or just the only one that is implemented here? >> >>> + }, { >>> + .pixfmt = V4L2_PIX_FMT_MPEG4, >>> + .num_planes = 1, >>> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >>> + }, { >>> + .pixfmt = V4L2_PIX_FMT_MPEG2, >>> + .num_planes = 1, >>> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >>> + }, { >>> + .pixfmt = V4L2_PIX_FMT_H263, >>> + .num_planes = 1, >>> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >>> + }, { >>> + .pixfmt = V4L2_PIX_FMT_VC1_ANNEX_G, >>> + .num_planes = 1, >>> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >>> + }, { >>> + .pixfmt = V4L2_PIX_FMT_VC1_ANNEX_L, >>> + .num_planes = 1, >>> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >>> + }, { >>> + .pixfmt = V4L2_PIX_FMT_H264, >>> + .num_planes = 1, >>> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >>> + }, { >>> + .pixfmt = V4L2_PIX_FMT_VP8, >>> + .num_planes = 1, >>> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >>> + }, { >>> + .pixfmt = V4L2_PIX_FMT_XVID, >>> + .num_planes = 1, >>> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >>> + }, >> >> num_planes is always 1, do you need it at all? And if it is always one, >> why use _MPLANE at all? Is this for future additions? >> >>> +}; >>> + > > <snip> three reasons: > - _MPLAIN allows one plane only > - downstream qualcomm driver use _MPLAIN (the second plain is used for extaradata, I ignored the extaradata support for now until v4l2 metadata api is merged) > - I still believe that qualcomm firmware guys will add support the second or even third plain at some point. > >>> + >>> +static void vdec_buf_done(struct venus_inst *inst, unsigned int buf_type, >>> + u32 tag, u32 bytesused, u32 data_offset, u32 flags, >>> + u64 timestamp_us) >>> +{ >>> + struct vb2_v4l2_buffer *vbuf; >>> + struct vb2_buffer *vb; >>> + unsigned int type; >>> + >>> + if (buf_type == HFI_BUFFER_INPUT) >>> + type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE; >>> + else >>> + type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; >>> + >>> + vbuf = helper_find_buf(inst, type, tag); >>> + if (!vbuf) >>> + return; >>> + >>> + vbuf->flags = flags; >>> + >>> + if (type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { >>> + vb = &vbuf->vb2_buf; >>> + vb->planes[0].bytesused = >>> + max_t(unsigned int, inst->output_buf_size, bytesused); >>> + vb->planes[0].data_offset = data_offset; >>> + vb->timestamp = timestamp_us * NSEC_PER_USEC; >>> + vbuf->sequence = inst->sequence++; >> >> timestamp and sequence are only set for CAPTURE, not OUTPUT. Is that correct? > > Correct. I can add sequence for the OUTPUT queue too, but I have no idea how that sequence is used by userspace. You set V4L2_BUF_FLAG_TIMESTAMP_COPY, so you have to copy the timestamp from the output buffer to the capture buffer, if that makes sense for this codec. If not, then you shouldn't use that V4L2_BUF_FLAG and just generate new timestamps whenever a capture buffer is ready. For sequence numbering just give the output queue its own sequence counter. Regards, Hans > >> >>> + >>> + if (vbuf->flags & V4L2_BUF_FLAG_LAST) { >>> + const struct v4l2_event ev = { .type = V4L2_EVENT_EOS }; >>> + >>> + v4l2_event_queue_fh(&inst->fh, &ev); >>> + } >>> + } >>> + >>> + v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_DONE); >>> +} > > <snip> >
On 25/03/17 23:30, Stanimir Varbanov wrote: > Thanks for the comments! > > On 03/24/2017 04:41 PM, Hans Verkuil wrote: >> Some comments and questions below: >> >> On 03/13/17 17:37, Stanimir Varbanov wrote: >>> This consists of video decoder implementation plus decoder >>> controls. >>> >>> Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org> >>> --- >>> drivers/media/platform/qcom/venus/vdec.c | 1091 ++++++++++++++++++++++++ >>> drivers/media/platform/qcom/venus/vdec.h | 23 + >>> drivers/media/platform/qcom/venus/vdec_ctrls.c | 149 ++++ >>> 3 files changed, 1263 insertions(+) >>> create mode 100644 drivers/media/platform/qcom/venus/vdec.c >>> create mode 100644 drivers/media/platform/qcom/venus/vdec.h >>> create mode 100644 drivers/media/platform/qcom/venus/vdec_ctrls.c >>> >>> diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c >>> new file mode 100644 >>> index 000000000000..ec5203f2ba81 >>> --- /dev/null >>> +++ b/drivers/media/platform/qcom/venus/vdec.c >>> @@ -0,0 +1,1091 @@ >>> +/* >>> + * Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. >>> + * Copyright (C) 2017 Linaro Ltd. >>> + * >>> + * This program is free software; you can redistribute it and/or modify >>> + * it under the terms of the GNU General Public License version 2 and >>> + * only version 2 as published by the Free Software Foundation. >>> + * >>> + * This program is distributed in the hope that it will be useful, >>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >>> + * GNU General Public License for more details. >>> + * >>> + */ >>> +#include <linux/clk.h> >>> +#include <linux/module.h> >>> +#include <linux/platform_device.h> >>> +#include <linux/pm_runtime.h> >>> +#include <linux/slab.h> >>> +#include <media/v4l2-ioctl.h> >>> +#include <media/v4l2-event.h> >>> +#include <media/v4l2-ctrls.h> >>> +#include <media/v4l2-mem2mem.h> >>> +#include <media/videobuf2-dma-sg.h> >>> + >>> +#include "hfi_venus_io.h" >>> +#include "core.h" >>> +#include "helpers.h" >>> +#include "vdec.h" >>> + >>> +static u32 get_framesize_uncompressed(unsigned int plane, u32 width, u32 height) >>> +{ >>> + u32 y_stride, uv_stride, y_plane; >>> + u32 y_sclines, uv_sclines, uv_plane; >>> + u32 size; >>> + >>> + y_stride = ALIGN(width, 128); >>> + uv_stride = ALIGN(width, 128); >>> + y_sclines = ALIGN(height, 32); >>> + uv_sclines = ALIGN(((height + 1) >> 1), 16); >>> + >>> + y_plane = y_stride * y_sclines; >>> + uv_plane = uv_stride * uv_sclines + SZ_4K; >>> + size = y_plane + uv_plane + SZ_8K; >>> + >>> + return ALIGN(size, SZ_4K); >>> +} >>> + >>> +static u32 get_framesize_compressed(unsigned int width, unsigned int height) >>> +{ >>> + return ((width * height * 3 / 2) / 2) + 128; >>> +} >>> + >>> +static const struct venus_format vdec_formats[] = { >>> + { >>> + .pixfmt = V4L2_PIX_FMT_NV12, >>> + .num_planes = 1, >>> + .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, >> >> Just curious: is NV12 the only uncompressed format supported by the hardware? >> Or just the only one that is implemented here? >> >>> + }, { >>> + .pixfmt = V4L2_PIX_FMT_MPEG4, >>> + .num_planes = 1, >>> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >>> + }, { >>> + .pixfmt = V4L2_PIX_FMT_MPEG2, >>> + .num_planes = 1, >>> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >>> + }, { >>> + .pixfmt = V4L2_PIX_FMT_H263, >>> + .num_planes = 1, >>> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >>> + }, { >>> + .pixfmt = V4L2_PIX_FMT_VC1_ANNEX_G, >>> + .num_planes = 1, >>> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >>> + }, { >>> + .pixfmt = V4L2_PIX_FMT_VC1_ANNEX_L, >>> + .num_planes = 1, >>> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >>> + }, { >>> + .pixfmt = V4L2_PIX_FMT_H264, >>> + .num_planes = 1, >>> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >>> + }, { >>> + .pixfmt = V4L2_PIX_FMT_VP8, >>> + .num_planes = 1, >>> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >>> + }, { >>> + .pixfmt = V4L2_PIX_FMT_XVID, >>> + .num_planes = 1, >>> + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, >>> + }, >> >> num_planes is always 1, do you need it at all? And if it is always one, >> why use _MPLANE at all? Is this for future additions? >> >>> +}; >>> + > > <snip> three reasons: > - _MPLAIN allows one plane only > - downstream qualcomm driver use _MPLAIN (the second plain is used for extaradata, I ignored the extaradata support for now until v4l2 metadata api is merged) > - I still believe that qualcomm firmware guys will add support the second or even third plain at some point. Please add a comment in the code explaining the reason. Just before this format list would be a good place for that. Hans > >>> + >>> +static void vdec_buf_done(struct venus_inst *inst, unsigned int buf_type, >>> + u32 tag, u32 bytesused, u32 data_offset, u32 flags, >>> + u64 timestamp_us) >>> +{ >>> + struct vb2_v4l2_buffer *vbuf; >>> + struct vb2_buffer *vb; >>> + unsigned int type; >>> + >>> + if (buf_type == HFI_BUFFER_INPUT) >>> + type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE; >>> + else >>> + type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; >>> + >>> + vbuf = helper_find_buf(inst, type, tag); >>> + if (!vbuf) >>> + return; >>> + >>> + vbuf->flags = flags; >>> + >>> + if (type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { >>> + vb = &vbuf->vb2_buf; >>> + vb->planes[0].bytesused = >>> + max_t(unsigned int, inst->output_buf_size, bytesused); >>> + vb->planes[0].data_offset = data_offset; >>> + vb->timestamp = timestamp_us * NSEC_PER_USEC; >>> + vbuf->sequence = inst->sequence++; >> >> timestamp and sequence are only set for CAPTURE, not OUTPUT. Is that correct? > > Correct. I can add sequence for the OUTPUT queue too, but I have no idea how that sequence is used by userspace. > >> >>> + >>> + if (vbuf->flags & V4L2_BUF_FLAG_LAST) { >>> + const struct v4l2_event ev = { .type = V4L2_EVENT_EOS }; >>> + >>> + v4l2_event_queue_fh(&inst->fh, &ev); >>> + } >>> + } >>> + >>> + v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_DONE); >>> +} > > <snip> >
On 27/03/17 04:18, Nicolas Dufresne wrote: > Le dimanche 26 mars 2017 à 00:30 +0200, Stanimir Varbanov a écrit : >>>> + vb->planes[0].data_offset = data_offset; >>>> + vb->timestamp = timestamp_us * NSEC_PER_USEC; >>>> + vbuf->sequence = inst->sequence++; >>> >>> timestamp and sequence are only set for CAPTURE, not OUTPUT. Is >>> that correct? >> >> Correct. I can add sequence for the OUTPUT queue too, but I have no idea >> how that sequence is used by userspace. > > Neither GStreamer or Chromium seems to use it. What does that number > means for a m2m driver ? Does it really means something ? It can be used to detect dropped frame (the sequence counter will skip in that case). Unlikely to happen for m2m devices, and most apps ignore it as well. But you still need to fill it in, it's a V4L2 requirement. Regards, Hans
Hi Hans, On 03/27/2017 11:45 AM, Hans Verkuil wrote: > On 25/03/17 23:30, Stanimir Varbanov wrote: >> Thanks for the comments! <snip> >>>> +static void vdec_buf_done(struct venus_inst *inst, unsigned int buf_type, >>>> + u32 tag, u32 bytesused, u32 data_offset, u32 flags, >>>> + u64 timestamp_us) >>>> +{ >>>> + struct vb2_v4l2_buffer *vbuf; >>>> + struct vb2_buffer *vb; >>>> + unsigned int type; >>>> + >>>> + if (buf_type == HFI_BUFFER_INPUT) >>>> + type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE; >>>> + else >>>> + type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; >>>> + >>>> + vbuf = helper_find_buf(inst, type, tag); >>>> + if (!vbuf) >>>> + return; >>>> + >>>> + vbuf->flags = flags; >>>> + >>>> + if (type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { >>>> + vb = &vbuf->vb2_buf; >>>> + vb->planes[0].bytesused = >>>> + max_t(unsigned int, inst->output_buf_size, bytesused); >>>> + vb->planes[0].data_offset = data_offset; >>>> + vb->timestamp = timestamp_us * NSEC_PER_USEC; >>>> + vbuf->sequence = inst->sequence++; >>> >>> timestamp and sequence are only set for CAPTURE, not OUTPUT. Is that correct? >> >> Correct. I can add sequence for the OUTPUT queue too, but I have no idea how that sequence is used by userspace. > > You set V4L2_BUF_FLAG_TIMESTAMP_COPY, so you have to copy the timestamp from the output buffer > to the capture buffer, if that makes sense for this codec. If not, then you shouldn't use that The timestamp_us is filled by firmware and it is the timestamp of the output buffer which is used to produce the uncompressed capture buffer. So I think V4L2_BUF_FLAG_TIMESTAMP_COPY is correctly used here. > V4L2_BUF_FLAG and just generate new timestamps whenever a capture buffer is ready. > > For sequence numbering just give the output queue its own sequence counter. OK will do.
Le lundi 27 mars 2017 à 10:45 +0200, Hans Verkuil a écrit : > > > timestamp and sequence are only set for CAPTURE, not OUTPUT. Is > > > that correct? > > > > Correct. I can add sequence for the OUTPUT queue too, but I have no > > idea how that sequence is used by userspace. > > You set V4L2_BUF_FLAG_TIMESTAMP_COPY, so you have to copy the > timestamp from the output buffer > to the capture buffer, if that makes sense for this codec. If not, > then you shouldn't use that > V4L2_BUF_FLAG and just generate new timestamps whenever a capture > buffer is ready. > > For sequence numbering just give the output queue its own sequence > counter. Btw, GStreamer and Chromium only supports TIMESTAMP_COPY, and will most likely leak frames if you craft timestamp. Nicolas
diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c new file mode 100644 index 000000000000..ec5203f2ba81 --- /dev/null +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -0,0 +1,1091 @@ +/* + * Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. + * Copyright (C) 2017 Linaro Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ +#include <linux/clk.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> +#include <linux/slab.h> +#include <media/v4l2-ioctl.h> +#include <media/v4l2-event.h> +#include <media/v4l2-ctrls.h> +#include <media/v4l2-mem2mem.h> +#include <media/videobuf2-dma-sg.h> + +#include "hfi_venus_io.h" +#include "core.h" +#include "helpers.h" +#include "vdec.h" + +static u32 get_framesize_uncompressed(unsigned int plane, u32 width, u32 height) +{ + u32 y_stride, uv_stride, y_plane; + u32 y_sclines, uv_sclines, uv_plane; + u32 size; + + y_stride = ALIGN(width, 128); + uv_stride = ALIGN(width, 128); + y_sclines = ALIGN(height, 32); + uv_sclines = ALIGN(((height + 1) >> 1), 16); + + y_plane = y_stride * y_sclines; + uv_plane = uv_stride * uv_sclines + SZ_4K; + size = y_plane + uv_plane + SZ_8K; + + return ALIGN(size, SZ_4K); +} + +static u32 get_framesize_compressed(unsigned int width, unsigned int height) +{ + return ((width * height * 3 / 2) / 2) + 128; +} + +static const struct venus_format vdec_formats[] = { + { + .pixfmt = V4L2_PIX_FMT_NV12, + .num_planes = 1, + .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, + }, { + .pixfmt = V4L2_PIX_FMT_MPEG4, + .num_planes = 1, + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, + }, { + .pixfmt = V4L2_PIX_FMT_MPEG2, + .num_planes = 1, + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, + }, { + .pixfmt = V4L2_PIX_FMT_H263, + .num_planes = 1, + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, + }, { + .pixfmt = V4L2_PIX_FMT_VC1_ANNEX_G, + .num_planes = 1, + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, + }, { + .pixfmt = V4L2_PIX_FMT_VC1_ANNEX_L, + .num_planes = 1, + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, + }, { + .pixfmt = V4L2_PIX_FMT_H264, + .num_planes = 1, + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, + }, { + .pixfmt = V4L2_PIX_FMT_VP8, + .num_planes = 1, + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, + }, { + .pixfmt = V4L2_PIX_FMT_XVID, + .num_planes = 1, + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, + }, +}; + +static const struct venus_format *find_format(u32 pixfmt, u32 type) +{ + const struct venus_format *fmt = vdec_formats; + unsigned int size = ARRAY_SIZE(vdec_formats); + unsigned int i; + + for (i = 0; i < size; i++) { + if (fmt[i].pixfmt == pixfmt) + break; + } + + if (i == size || fmt[i].type != type) + return NULL; + + return &fmt[i]; +} + +static const struct venus_format *find_format_by_index(int index, u32 type) +{ + const struct venus_format *fmt = vdec_formats; + unsigned int size = ARRAY_SIZE(vdec_formats); + int i, k = 0; + + if (index < 0 || index > size) + return NULL; + + for (i = 0; i < size; i++) { + if (fmt[i].type != type) + continue; + if (k == index) + break; + k++; + } + + if (i == size) + return NULL; + + return &fmt[i]; +} + +static const struct venus_format * +vdec_try_fmt_common(struct venus_inst *inst, struct v4l2_format *f) +{ + struct v4l2_pix_format_mplane *pixmp = &f->fmt.pix_mp; + struct v4l2_plane_pix_format *pfmt = pixmp->plane_fmt; + const struct venus_format *fmt; + unsigned int p; + + memset(pfmt[0].reserved, 0, sizeof(pfmt[0].reserved)); + memset(pixmp->reserved, 0, sizeof(pixmp->reserved)); + + fmt = find_format(pixmp->pixelformat, f->type); + if (!fmt) { + if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) + pixmp->pixelformat = V4L2_PIX_FMT_NV12; + else if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) + pixmp->pixelformat = V4L2_PIX_FMT_H264; + else + return NULL; + fmt = find_format(pixmp->pixelformat, f->type); + pixmp->width = 1280; + pixmp->height = 720; + } + + pixmp->width = clamp(pixmp->width, inst->cap_width.min, + inst->cap_width.max); + pixmp->height = clamp(pixmp->height, inst->cap_height.min, + inst->cap_height.max); + + if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) + pixmp->height = ALIGN(pixmp->height, 32); + + if (pixmp->field == V4L2_FIELD_ANY) + pixmp->field = V4L2_FIELD_NONE; + pixmp->num_planes = fmt->num_planes; + pixmp->flags = 0; + + if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { + for (p = 0; p < pixmp->num_planes; p++) { + pfmt[p].sizeimage = + get_framesize_uncompressed(p, pixmp->width, + pixmp->height); + pfmt[p].bytesperline = ALIGN(pixmp->width, 128); + } + } else { + pfmt[0].sizeimage = get_framesize_compressed(pixmp->width, + pixmp->height); + pfmt[0].bytesperline = 0; + } + + return fmt; +} + +static int vdec_try_fmt(struct file *file, void *fh, struct v4l2_format *f) +{ + struct venus_inst *inst = to_inst(file); + + vdec_try_fmt_common(inst, f); + + return 0; +} + +static int vdec_g_fmt(struct file *file, void *fh, struct v4l2_format *f) +{ + struct venus_inst *inst = to_inst(file); + const struct venus_format *fmt = NULL; + struct v4l2_pix_format_mplane *pixmp = &f->fmt.pix_mp; + + if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) + fmt = inst->fmt_cap; + else if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) + fmt = inst->fmt_out; + + if (inst->reconfig) { + struct v4l2_format format = {}; + + inst->out_width = inst->reconfig_width; + inst->out_height = inst->reconfig_height; + inst->reconfig = false; + + format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; + format.fmt.pix_mp.pixelformat = inst->fmt_cap->pixfmt; + format.fmt.pix_mp.width = inst->out_width; + format.fmt.pix_mp.height = inst->out_height; + + vdec_try_fmt_common(inst, &format); + + inst->width = format.fmt.pix_mp.width; + inst->height = format.fmt.pix_mp.height; + } + + pixmp->pixelformat = fmt->pixfmt; + + if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { + pixmp->width = inst->width; + pixmp->height = inst->height; + pixmp->colorspace = inst->colorspace; + pixmp->ycbcr_enc = inst->ycbcr_enc; + pixmp->quantization = inst->quantization; + pixmp->xfer_func = inst->xfer_func; + } else if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { + pixmp->width = inst->out_width; + pixmp->height = inst->out_height; + } + + vdec_try_fmt_common(inst, f); + + return 0; +} + +static int vdec_s_fmt(struct file *file, void *fh, struct v4l2_format *f) +{ + struct venus_inst *inst = to_inst(file); + struct v4l2_pix_format_mplane *pixmp = &f->fmt.pix_mp; + struct v4l2_pix_format_mplane orig_pixmp; + const struct venus_format *fmt; + struct v4l2_format format; + u32 pixfmt_out = 0, pixfmt_cap = 0; + + orig_pixmp = *pixmp; + + fmt = vdec_try_fmt_common(inst, f); + + if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { + pixfmt_out = pixmp->pixelformat; + pixfmt_cap = inst->fmt_cap->pixfmt; + } else if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { + pixfmt_cap = pixmp->pixelformat; + pixfmt_out = inst->fmt_out->pixfmt; + } + + memset(&format, 0, sizeof(format)); + + format.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE; + format.fmt.pix_mp.pixelformat = pixfmt_out; + format.fmt.pix_mp.width = orig_pixmp.width; + format.fmt.pix_mp.height = orig_pixmp.height; + vdec_try_fmt_common(inst, &format); + + if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { + inst->out_width = format.fmt.pix_mp.width; + inst->out_height = format.fmt.pix_mp.height; + inst->colorspace = pixmp->colorspace; + inst->ycbcr_enc = pixmp->ycbcr_enc; + inst->quantization = pixmp->quantization; + inst->xfer_func = pixmp->xfer_func; + } + + memset(&format, 0, sizeof(format)); + + format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; + format.fmt.pix_mp.pixelformat = pixfmt_cap; + format.fmt.pix_mp.width = orig_pixmp.width; + format.fmt.pix_mp.height = orig_pixmp.height; + vdec_try_fmt_common(inst, &format); + + inst->width = format.fmt.pix_mp.width; + inst->height = format.fmt.pix_mp.height; + + if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) + inst->fmt_out = fmt; + else if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) + inst->fmt_cap = fmt; + + return 0; +} + +static int +vdec_g_selection(struct file *file, void *fh, struct v4l2_selection *s) +{ + struct venus_inst *inst = to_inst(file); + + if (s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE && + s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) + return -EINVAL; + + switch (s->target) { + case V4L2_SEL_TGT_CROP_BOUNDS: + case V4L2_SEL_TGT_CROP_DEFAULT: + case V4L2_SEL_TGT_CROP: + if (s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) + return -EINVAL; + s->r.width = inst->out_width; + s->r.height = inst->out_height; + break; + case V4L2_SEL_TGT_COMPOSE_BOUNDS: + case V4L2_SEL_TGT_COMPOSE_PADDED: + if (s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) + return -EINVAL; + s->r.width = inst->width; + s->r.height = inst->height; + break; + case V4L2_SEL_TGT_COMPOSE_DEFAULT: + case V4L2_SEL_TGT_COMPOSE: + if (s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) + return -EINVAL; + s->r.width = inst->out_width; + s->r.height = inst->out_height; + break; + default: + return -EINVAL; + } + + s->r.top = 0; + s->r.left = 0; + + return 0; +} + +static int +vdec_querycap(struct file *file, void *fh, struct v4l2_capability *cap) +{ + strlcpy(cap->driver, "qcom-venus", sizeof(cap->driver)); + strlcpy(cap->card, "Qualcomm Venus video decoder", sizeof(cap->card)); + strlcpy(cap->bus_info, "platform:qcom-venus", sizeof(cap->bus_info)); + + return 0; +} + +static int vdec_enum_fmt(struct file *file, void *fh, struct v4l2_fmtdesc *f) +{ + const struct venus_format *fmt; + + memset(f->reserved, 0, sizeof(f->reserved)); + + fmt = find_format_by_index(f->index, f->type); + if (!fmt) + return -EINVAL; + + f->pixelformat = fmt->pixfmt; + + return 0; +} + +static int vdec_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a) +{ + struct venus_inst *inst = to_inst(file); + struct v4l2_captureparm *cap = &a->parm.capture; + struct v4l2_fract *timeperframe = &cap->timeperframe; + u64 us_per_frame, fps; + + if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE && + a->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) + return -EINVAL; + + memset(cap->reserved, 0, sizeof(cap->reserved)); + if (!timeperframe->denominator) + timeperframe->denominator = inst->timeperframe.denominator; + if (!timeperframe->numerator) + timeperframe->numerator = inst->timeperframe.numerator; + cap->readbuffers = 0; + cap->extendedmode = 0; + cap->capability = V4L2_CAP_TIMEPERFRAME; + us_per_frame = timeperframe->numerator * (u64)USEC_PER_SEC; + do_div(us_per_frame, timeperframe->denominator); + + if (!us_per_frame) + return -EINVAL; + + fps = (u64)USEC_PER_SEC; + do_div(fps, us_per_frame); + + inst->fps = fps; + inst->timeperframe = *timeperframe; + + return 0; +} + +static int vdec_enum_framesizes(struct file *file, void *fh, + struct v4l2_frmsizeenum *fsize) +{ + struct venus_inst *inst = to_inst(file); + const struct venus_format *fmt; + + fmt = find_format(fsize->pixel_format, + V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE); + if (!fmt) { + fmt = find_format(fsize->pixel_format, + V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE); + if (!fmt) + return -EINVAL; + } + + if (fsize->index) + return -EINVAL; + + fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE; + + fsize->stepwise.min_width = inst->cap_width.min; + fsize->stepwise.max_width = inst->cap_width.max; + fsize->stepwise.step_width = inst->cap_width.step_size; + fsize->stepwise.min_height = inst->cap_height.min; + fsize->stepwise.max_height = inst->cap_height.max; + fsize->stepwise.step_height = inst->cap_height.step_size; + + return 0; +} + +static int vdec_subscribe_event(struct v4l2_fh *fh, + const struct v4l2_event_subscription *sub) +{ + switch (sub->type) { + case V4L2_EVENT_EOS: + return v4l2_event_subscribe(fh, sub, 2, NULL); + case V4L2_EVENT_SOURCE_CHANGE: + return v4l2_src_change_event_subscribe(fh, sub); + case V4L2_EVENT_CTRL: + return v4l2_ctrl_subscribe_event(fh, sub); + default: + return -EINVAL; + } +} + +static const struct v4l2_ioctl_ops vdec_ioctl_ops = { + .vidioc_querycap = vdec_querycap, + .vidioc_enum_fmt_vid_cap_mplane = vdec_enum_fmt, + .vidioc_enum_fmt_vid_out_mplane = vdec_enum_fmt, + .vidioc_s_fmt_vid_cap_mplane = vdec_s_fmt, + .vidioc_s_fmt_vid_out_mplane = vdec_s_fmt, + .vidioc_g_fmt_vid_cap_mplane = vdec_g_fmt, + .vidioc_g_fmt_vid_out_mplane = vdec_g_fmt, + .vidioc_try_fmt_vid_cap_mplane = vdec_try_fmt, + .vidioc_try_fmt_vid_out_mplane = vdec_try_fmt, + .vidioc_g_selection = vdec_g_selection, + .vidioc_reqbufs = v4l2_m2m_ioctl_reqbufs, + .vidioc_querybuf = v4l2_m2m_ioctl_querybuf, + .vidioc_create_bufs = v4l2_m2m_ioctl_create_bufs, + .vidioc_prepare_buf = v4l2_m2m_ioctl_prepare_buf, + .vidioc_qbuf = v4l2_m2m_ioctl_qbuf, + .vidioc_expbuf = v4l2_m2m_ioctl_expbuf, + .vidioc_dqbuf = v4l2_m2m_ioctl_dqbuf, + .vidioc_streamon = v4l2_m2m_ioctl_streamon, + .vidioc_streamoff = v4l2_m2m_ioctl_streamoff, + .vidioc_s_parm = vdec_s_parm, + .vidioc_enum_framesizes = vdec_enum_framesizes, + .vidioc_subscribe_event = vdec_subscribe_event, + .vidioc_unsubscribe_event = v4l2_event_unsubscribe, +}; + +static int vdec_set_properties(struct venus_inst *inst) +{ + struct vdec_controls *ctr = &inst->controls.dec; + struct venus_core *core = inst->core; + struct hfi_enable en = { .enable = 1 }; + u32 ptype; + int ret; + + ptype = HFI_PROPERTY_PARAM_VDEC_CONTINUE_DATA_TRANSFER; + ret = hfi_session_set_property(inst, ptype, &en); + if (ret) + return ret; + + if (core->res->hfi_version == HFI_VERSION_3XX) { + struct hfi_buffer_alloc_mode mode; + + ptype = HFI_PROPERTY_PARAM_BUFFER_ALLOC_MODE; + mode.type = HFI_BUFFER_OUTPUT; + mode.mode = HFI_BUFFER_MODE_DYNAMIC; + + ret = hfi_session_set_property(inst, ptype, &mode); + if (ret) + return ret; + } + + if (ctr->post_loop_deb_mode) { + ptype = HFI_PROPERTY_CONFIG_VDEC_POST_LOOP_DEBLOCKER; + en.enable = 1; + ret = hfi_session_set_property(inst, ptype, &en); + if (ret) + return ret; + } + + return 0; +} + +static int vdec_init_session(struct venus_inst *inst) +{ + int ret; + + ret = hfi_session_init(inst, inst->fmt_out->pixfmt); + if (ret) + return ret; + + ret = helper_set_input_resolution(inst, inst->out_width, + inst->out_height); + if (ret) + goto deinit; + + ret = helper_set_color_format(inst, inst->fmt_cap->pixfmt); + if (ret) + goto deinit; + + return 0; +deinit: + hfi_session_deinit(inst); + return ret; +} + +static int vdec_cap_num_buffers(struct venus_inst *inst, unsigned int *num) +{ + struct hfi_buffer_requirements bufreq; + int ret; + + ret = vdec_init_session(inst); + if (ret) + return ret; + + ret = helper_get_bufreq(inst, HFI_BUFFER_OUTPUT, &bufreq); + + *num = bufreq.count_actual; + + hfi_session_deinit(inst); + + return ret; +} + +static int vdec_queue_setup(struct vb2_queue *q, + unsigned int *num_buffers, unsigned int *num_planes, + unsigned int sizes[], struct device *alloc_devs[]) +{ + struct venus_inst *inst = vb2_get_drv_priv(q); + unsigned int p, num; + int ret = 0; + + if (*num_planes) { + if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE && + *num_planes != inst->fmt_out->num_planes) + return -EINVAL; + + if (q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE && + *num_planes != inst->fmt_cap->num_planes) + return -EINVAL; + + if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE && + sizes[0] < inst->input_buf_size) + return -EINVAL; + + if (q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE && + sizes[0] < inst->output_buf_size) + return -EINVAL; + + if (inst->core->res->hfi_version == HFI_VERSION_LEGACY) + return -EINVAL; + + return 0; + } + + switch (q->type) { + case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE: + *num_planes = inst->fmt_out->num_planes; + sizes[0] = get_framesize_compressed(inst->out_width, + inst->out_height); + inst->input_buf_size = sizes[0]; + inst->num_input_bufs = *num_buffers; + break; + case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE: + *num_planes = inst->fmt_cap->num_planes; + + ret = vdec_cap_num_buffers(inst, &num); + if (ret) + break; + + *num_buffers = max(*num_buffers, num); + + for (p = 0; p < *num_planes; p++) + sizes[p] = get_framesize_uncompressed(p, inst->width, + inst->height); + + inst->num_output_bufs = *num_buffers; + inst->output_buf_size = sizes[0]; + break; + default: + ret = -EINVAL; + break; + } + + return ret; +} + +static int vdec_verify_conf(struct venus_inst *inst) +{ + struct hfi_buffer_requirements bufreq; + int ret; + + if (!inst->num_input_bufs || !inst->num_output_bufs) + return -EINVAL; + + ret = helper_get_bufreq(inst, HFI_BUFFER_OUTPUT, &bufreq); + if (ret) + return ret; + + if (inst->num_output_bufs < bufreq.count_actual || + inst->num_output_bufs < bufreq.count_min) + return -EINVAL; + + ret = helper_get_bufreq(inst, HFI_BUFFER_INPUT, &bufreq); + if (ret) + return ret; + + if (inst->num_input_bufs < bufreq.count_min) + return -EINVAL; + + return 0; +} + +static int vdec_start_streaming(struct vb2_queue *q, unsigned int count) +{ + struct venus_inst *inst = vb2_get_drv_priv(q); + struct venus_core *core = inst->core; + u32 ptype; + int ret; + + mutex_lock(&inst->lock); + + if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) + inst->streamon_out = 1; + else + inst->streamon_cap = 1; + + if (!(inst->streamon_out & inst->streamon_cap)) { + mutex_unlock(&inst->lock); + return 0; + } + + inst->reconfig = false; + inst->sequence = 0; + inst->codec_cfg = false; + + ret = vdec_init_session(inst); + if (ret) + goto bufs_done; + + ret = vdec_set_properties(inst); + if (ret) + goto deinit_sess; + + if (core->res->hfi_version == HFI_VERSION_3XX) { + struct hfi_buffer_size_actual buf_sz; + + ptype = HFI_PROPERTY_PARAM_BUFFER_SIZE_ACTUAL; + buf_sz.type = HFI_BUFFER_OUTPUT; + buf_sz.size = inst->output_buf_size; + + ret = hfi_session_set_property(inst, ptype, &buf_sz); + if (ret) + goto deinit_sess; + } + + ret = vdec_verify_conf(inst); + if (ret) + goto deinit_sess; + + ret = helper_set_num_bufs(inst, inst->num_input_bufs, + inst->num_output_bufs); + if (ret) + goto deinit_sess; + + ret = helper_vb2_start_streaming(inst); + if (ret) + goto deinit_sess; + + mutex_unlock(&inst->lock); + + return 0; + +deinit_sess: + hfi_session_deinit(inst); +bufs_done: + helper_buffers_done(inst, VB2_BUF_STATE_QUEUED); + if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) + inst->streamon_out = 0; + else + inst->streamon_cap = 0; + mutex_unlock(&inst->lock); + return ret; +} + +static const struct vb2_ops vdec_vb2_ops = { + .queue_setup = vdec_queue_setup, + .buf_init = helper_vb2_buf_init, + .buf_prepare = helper_vb2_buf_prepare, + .start_streaming = vdec_start_streaming, + .stop_streaming = helper_vb2_stop_streaming, + .buf_queue = helper_vb2_buf_queue, +}; + +static void vdec_buf_done(struct venus_inst *inst, unsigned int buf_type, + u32 tag, u32 bytesused, u32 data_offset, u32 flags, + u64 timestamp_us) +{ + struct vb2_v4l2_buffer *vbuf; + struct vb2_buffer *vb; + unsigned int type; + + if (buf_type == HFI_BUFFER_INPUT) + type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE; + else + type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; + + vbuf = helper_find_buf(inst, type, tag); + if (!vbuf) + return; + + vbuf->flags = flags; + + if (type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { + vb = &vbuf->vb2_buf; + vb->planes[0].bytesused = + max_t(unsigned int, inst->output_buf_size, bytesused); + vb->planes[0].data_offset = data_offset; + vb->timestamp = timestamp_us * NSEC_PER_USEC; + vbuf->sequence = inst->sequence++; + + if (vbuf->flags & V4L2_BUF_FLAG_LAST) { + const struct v4l2_event ev = { .type = V4L2_EVENT_EOS }; + + v4l2_event_queue_fh(&inst->fh, &ev); + } + } + + v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_DONE); +} + +static void vdec_event_notify(struct venus_inst *inst, u32 event, + struct hfi_event_data *data) +{ + struct venus_core *core = inst->core; + struct device *dev = core->dev_dec; + static const struct v4l2_event ev = { + .type = V4L2_EVENT_SOURCE_CHANGE, + .u.src_change.changes = V4L2_EVENT_SRC_CH_RESOLUTION }; + + switch (event) { + case EVT_SESSION_ERROR: + inst->session_error = true; + dev_err(dev, "dec: event session error %x\n", inst->error); + break; + case EVT_SYS_EVENT_CHANGE: + switch (data->event_type) { + case HFI_EVENT_DATA_SEQUENCE_CHANGED_SUFFICIENT_BUF_RESOURCES: + hfi_session_continue(inst); + dev_dbg(dev, "event sufficient resources\n"); + break; + case HFI_EVENT_DATA_SEQUENCE_CHANGED_INSUFFICIENT_BUF_RESOURCES: + inst->reconfig_height = data->height; + inst->reconfig_width = data->width; + inst->reconfig = true; + + v4l2_event_queue_fh(&inst->fh, &ev); + + dev_dbg(dev, "event not sufficient resources (%ux%u)\n", + data->width, data->height); + break; + default: + break; + } + break; + default: + break; + } +} + +static const struct hfi_inst_ops vdec_hfi_ops = { + .buf_done = vdec_buf_done, + .event_notify = vdec_event_notify, +}; + +static void vdec_inst_init(struct venus_inst *inst) +{ + inst->fmt_out = &vdec_formats[6]; + inst->fmt_cap = &vdec_formats[0]; + inst->width = 1280; + inst->height = ALIGN(720, 32); + inst->out_width = 1280; + inst->out_height = 720; + inst->fps = 30; + inst->timeperframe.numerator = 1; + inst->timeperframe.denominator = 30; + + inst->cap_width.min = 64; + if (inst->core->res->hfi_version == HFI_VERSION_LEGACY) + inst->cap_width.max = 1920; + else + inst->cap_width.max = 3840; + inst->cap_width.step_size = 1; + inst->cap_height.min = 64; + if (inst->core->res->hfi_version == HFI_VERSION_LEGACY) + inst->cap_height.max = ALIGN(1080, 32); + else + inst->cap_height.max = ALIGN(2160, 32); + inst->cap_height.step_size = 1; + inst->cap_framerate.min = 1; + inst->cap_framerate.max = 30; + inst->cap_framerate.step_size = 1; + inst->cap_mbs_per_frame.min = 16; + inst->cap_mbs_per_frame.max = 8160; +} + +static const struct v4l2_m2m_ops vdec_m2m_ops = { + .device_run = helper_m2m_device_run, + .job_abort = helper_m2m_job_abort, +}; + +static int m2m_queue_init(void *priv, struct vb2_queue *src_vq, + struct vb2_queue *dst_vq) +{ + struct venus_inst *inst = priv; + int ret; + + src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE; + src_vq->io_modes = VB2_MMAP | VB2_DMABUF; + src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; + src_vq->ops = &vdec_vb2_ops; + src_vq->mem_ops = &vb2_dma_sg_memops; + src_vq->drv_priv = inst; + src_vq->buf_struct_size = sizeof(struct venus_buffer); + src_vq->allow_zero_bytesused = 1; + src_vq->min_buffers_needed = 1; + src_vq->dev = inst->core->dev; + ret = vb2_queue_init(src_vq); + if (ret) + return ret; + + dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; + dst_vq->io_modes = VB2_MMAP | VB2_DMABUF; + dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; + dst_vq->ops = &vdec_vb2_ops; + dst_vq->mem_ops = &vb2_dma_sg_memops; + dst_vq->drv_priv = inst; + dst_vq->buf_struct_size = sizeof(struct venus_buffer); + dst_vq->allow_zero_bytesused = 1; + dst_vq->min_buffers_needed = 1; + dst_vq->dev = inst->core->dev; + ret = vb2_queue_init(dst_vq); + if (ret) { + vb2_queue_release(src_vq); + return ret; + } + + return 0; +} + +static int vdec_open(struct file *file) +{ + struct venus_core *core = video_drvdata(file); + struct venus_inst *inst; + int ret; + + inst = kzalloc(sizeof(*inst), GFP_KERNEL); + if (!inst) + return -ENOMEM; + + INIT_LIST_HEAD(&inst->registeredbufs); + INIT_LIST_HEAD(&inst->internalbufs); + INIT_LIST_HEAD(&inst->list); + mutex_init(&inst->lock); + + inst->core = core; + inst->session_type = VIDC_SESSION_TYPE_DEC; + + ret = pm_runtime_get_sync(core->dev_dec); + if (ret < 0) + goto err_free_inst; + + ret = vdec_ctrl_init(inst); + if (ret) + goto err_put_sync; + + ret = hfi_session_create(inst, &vdec_hfi_ops); + if (ret) + goto err_ctrl_deinit; + + vdec_inst_init(inst); + + /* + * create m2m device for every instance, the m2m context scheduling + * is made by firmware side so we do not need to care about. + */ + inst->m2m_dev = v4l2_m2m_init(&vdec_m2m_ops); + if (IS_ERR(inst->m2m_dev)) { + ret = PTR_ERR(inst->m2m_dev); + goto err_session_destroy; + } + + inst->m2m_ctx = v4l2_m2m_ctx_init(inst->m2m_dev, inst, m2m_queue_init); + if (IS_ERR(inst->m2m_ctx)) { + ret = PTR_ERR(inst->m2m_ctx); + goto err_m2m_release; + } + + v4l2_fh_init(&inst->fh, core->vdev_dec); + + inst->fh.ctrl_handler = &inst->ctrl_handler; + v4l2_fh_add(&inst->fh); + inst->fh.m2m_ctx = inst->m2m_ctx; + file->private_data = &inst->fh; + + return 0; + +err_m2m_release: + v4l2_m2m_release(inst->m2m_dev); +err_session_destroy: + hfi_session_destroy(inst); +err_ctrl_deinit: + vdec_ctrl_deinit(inst); +err_put_sync: + pm_runtime_put_sync(core->dev_dec); +err_free_inst: + kfree(inst); + return ret; +} + +static int vdec_close(struct file *file) +{ + struct venus_inst *inst = to_inst(file); + + v4l2_m2m_ctx_release(inst->m2m_ctx); + v4l2_m2m_release(inst->m2m_dev); + vdec_ctrl_deinit(inst); + hfi_session_destroy(inst); + mutex_destroy(&inst->lock); + v4l2_fh_del(&inst->fh); + v4l2_fh_exit(&inst->fh); + kfree(inst); + + pm_runtime_put_sync(inst->core->dev_dec); + return 0; +} + +static const struct v4l2_file_operations vdec_fops = { + .owner = THIS_MODULE, + .open = vdec_open, + .release = vdec_close, + .unlocked_ioctl = video_ioctl2, + .poll = v4l2_m2m_fop_poll, + .mmap = v4l2_m2m_fop_mmap, +#ifdef CONFIG_COMPAT + .compat_ioctl32 = v4l2_compat_ioctl32, +#endif +}; + +static int vdec_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct video_device *vdev; + struct venus_core *core; + int ret; + + if (!dev->parent) + return -EPROBE_DEFER; + + core = dev_get_drvdata(dev->parent); + if (!core) + return -EPROBE_DEFER; + + if (core->res->hfi_version == HFI_VERSION_3XX) { + core->core0_clk = devm_clk_get(dev, "core"); + if (IS_ERR(core->core0_clk)) + return PTR_ERR(core->core0_clk); + } + + platform_set_drvdata(pdev, core); + + vdev = video_device_alloc(); + if (!vdev) + return -ENOMEM; + + vdev->release = video_device_release; + vdev->fops = &vdec_fops; + vdev->ioctl_ops = &vdec_ioctl_ops; + vdev->vfl_dir = VFL_DIR_M2M; + vdev->v4l2_dev = &core->v4l2_dev; + vdev->device_caps = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING; + + ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1); + if (ret) + goto err_vdev_release; + + core->vdev_dec = vdev; + core->dev_dec = dev; + + video_set_drvdata(vdev, core); + pm_runtime_enable(dev); + + return 0; + +err_vdev_release: + video_device_release(vdev); + return ret; +} + +static int vdec_remove(struct platform_device *pdev) +{ + struct venus_core *core = dev_get_drvdata(pdev->dev.parent); + + video_unregister_device(core->vdev_dec); + pm_runtime_disable(core->dev_dec); + + return 0; +} + +#ifdef CONFIG_PM +static int vdec_runtime_suspend(struct device *dev) +{ + struct venus_core *core = dev_get_drvdata(dev); + + if (core->res->hfi_version == HFI_VERSION_LEGACY) + return 0; + + writel(0, core->base + WRAPPER_VDEC_VCODEC_POWER_CONTROL); + clk_disable_unprepare(core->core0_clk); + writel(1, core->base + WRAPPER_VDEC_VCODEC_POWER_CONTROL); + + return 0; +} + +static int vdec_runtime_resume(struct device *dev) +{ + struct venus_core *core = dev_get_drvdata(dev); + int ret; + + if (core->res->hfi_version == HFI_VERSION_LEGACY) + return 0; + + writel(0, core->base + WRAPPER_VDEC_VCODEC_POWER_CONTROL); + ret = clk_prepare_enable(core->core0_clk); + writel(1, core->base + WRAPPER_VDEC_VCODEC_POWER_CONTROL); + + return ret; +} +#endif + +static const struct dev_pm_ops vdec_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, + pm_runtime_force_resume) + SET_RUNTIME_PM_OPS(vdec_runtime_suspend, vdec_runtime_resume, NULL) +}; + +static const struct of_device_id vdec_dt_match[] = { + { .compatible = "venus-decoder" }, + { } +}; +MODULE_DEVICE_TABLE(of, vdec_dt_match); + +static struct platform_driver qcom_venus_dec_driver = { + .probe = vdec_probe, + .remove = vdec_remove, + .driver = { + .name = "qcom-venus-decoder", + .of_match_table = vdec_dt_match, + .pm = &vdec_pm_ops, + }, +}; +module_platform_driver(qcom_venus_dec_driver); + +MODULE_ALIAS("platform:qcom-venus-decoder"); +MODULE_DESCRIPTION("Qualcomm Venus video decoder driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/platform/qcom/venus/vdec.h b/drivers/media/platform/qcom/venus/vdec.h new file mode 100644 index 000000000000..84b672c54d02 --- /dev/null +++ b/drivers/media/platform/qcom/venus/vdec.h @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. + * Copyright (C) 2017 Linaro Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ +#ifndef __VENUS_VDEC_H__ +#define __VENUS_VDEC_H__ + +struct venus_inst; + +int vdec_ctrl_init(struct venus_inst *inst); +void vdec_ctrl_deinit(struct venus_inst *inst); + +#endif diff --git a/drivers/media/platform/qcom/venus/vdec_ctrls.c b/drivers/media/platform/qcom/venus/vdec_ctrls.c new file mode 100644 index 000000000000..c91e2ec37ea4 --- /dev/null +++ b/drivers/media/platform/qcom/venus/vdec_ctrls.c @@ -0,0 +1,149 @@ +/* + * Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. + * Copyright (C) 2017 Linaro Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ +#include <linux/types.h> +#include <media/v4l2-ctrls.h> + +#include "core.h" + +static int vdec_op_s_ctrl(struct v4l2_ctrl *ctrl) +{ + struct venus_inst *inst = ctrl_to_inst(ctrl); + struct vdec_controls *ctr = &inst->controls.dec; + + switch (ctrl->id) { + case V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER: + ctr->post_loop_deb_mode = ctrl->val; + break; + case V4L2_CID_MPEG_VIDEO_H264_PROFILE: + case V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE: + case V4L2_CID_MPEG_VIDEO_VPX_PROFILE: + ctr->profile = ctrl->val; + break; + case V4L2_CID_MPEG_VIDEO_H264_LEVEL: + case V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL: + ctr->level = ctrl->val; + break; + default: + return -EINVAL; + } + + return 0; +} + +static int vdec_op_g_volatile_ctrl(struct v4l2_ctrl *ctrl) +{ + struct venus_inst *inst = ctrl_to_inst(ctrl); + struct vdec_controls *ctr = &inst->controls.dec; + union hfi_get_property hprop; + u32 ptype = HFI_PROPERTY_PARAM_PROFILE_LEVEL_CURRENT; + int ret; + + switch (ctrl->id) { + case V4L2_CID_MPEG_VIDEO_H264_PROFILE: + case V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE: + case V4L2_CID_MPEG_VIDEO_VPX_PROFILE: + ret = hfi_session_get_property(inst, ptype, &hprop); + if (!ret) + ctr->profile = hprop.profile_level.profile; + ctrl->val = ctr->profile; + break; + case V4L2_CID_MPEG_VIDEO_H264_LEVEL: + case V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL: + ret = hfi_session_get_property(inst, ptype, &hprop); + if (!ret) + ctr->level = hprop.profile_level.level; + ctrl->val = ctr->level; + break; + case V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER: + ctrl->val = ctr->post_loop_deb_mode; + break; + default: + return -EINVAL; + }; + + return 0; +} + +static const struct v4l2_ctrl_ops vdec_ctrl_ops = { + .s_ctrl = vdec_op_s_ctrl, + .g_volatile_ctrl = vdec_op_g_volatile_ctrl, +}; + +int vdec_ctrl_init(struct venus_inst *inst) +{ + struct v4l2_ctrl *ctrl; + int ret; + + ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 6); + if (ret) + return ret; + + ctrl = v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &vdec_ctrl_ops, + V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE, + V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_CODING_EFFICIENCY, + ~((1 << V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE) | + (1 << V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_SIMPLE)), + V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE); + if (ctrl) + ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE; + + ctrl = v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &vdec_ctrl_ops, + V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL, + V4L2_MPEG_VIDEO_MPEG4_LEVEL_5, + 0, V4L2_MPEG_VIDEO_MPEG4_LEVEL_0); + if (ctrl) + ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE; + + ctrl = v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &vdec_ctrl_ops, + V4L2_CID_MPEG_VIDEO_H264_PROFILE, + V4L2_MPEG_VIDEO_H264_PROFILE_MULTIVIEW_HIGH, + ~((1 << V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE) | + (1 << V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE) | + (1 << V4L2_MPEG_VIDEO_H264_PROFILE_MAIN) | + (1 << V4L2_MPEG_VIDEO_H264_PROFILE_HIGH) | + (1 << V4L2_MPEG_VIDEO_H264_PROFILE_STEREO_HIGH) | + (1 << V4L2_MPEG_VIDEO_H264_PROFILE_MULTIVIEW_HIGH)), + V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE); + if (ctrl) + ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE; + + ctrl = v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &vdec_ctrl_ops, + V4L2_CID_MPEG_VIDEO_H264_LEVEL, + V4L2_MPEG_VIDEO_H264_LEVEL_5_1, + 0, V4L2_MPEG_VIDEO_H264_LEVEL_1_0); + if (ctrl) + ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE; + + ctrl = v4l2_ctrl_new_std(&inst->ctrl_handler, &vdec_ctrl_ops, + V4L2_CID_MPEG_VIDEO_VPX_PROFILE, 0, 3, 1, 0); + if (ctrl) + ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE; + + v4l2_ctrl_new_std(&inst->ctrl_handler, &vdec_ctrl_ops, + V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER, 0, 1, 1, 0); + + ret = inst->ctrl_handler.error; + if (ret) { + v4l2_ctrl_handler_free(&inst->ctrl_handler); + return ret; + } + + return 0; +} + +void vdec_ctrl_deinit(struct venus_inst *inst) +{ + v4l2_ctrl_handler_free(&inst->ctrl_handler); +}
This consists of video decoder implementation plus decoder controls. Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org> --- drivers/media/platform/qcom/venus/vdec.c | 1091 ++++++++++++++++++++++++ drivers/media/platform/qcom/venus/vdec.h | 23 + drivers/media/platform/qcom/venus/vdec_ctrls.c | 149 ++++ 3 files changed, 1263 insertions(+) create mode 100644 drivers/media/platform/qcom/venus/vdec.c create mode 100644 drivers/media/platform/qcom/venus/vdec.h create mode 100644 drivers/media/platform/qcom/venus/vdec_ctrls.c