Re: [PATCH v3 19/24] media: imx: Add IC subdev drivers
On Fri, Jan 06, 2017 at 06:11:37PM -0800, Steve Longerbeam wrote: > This is a set of three media entity subdevice drivers for the i.MX > Image Converter. The i.MX IC module contains three independent > "tasks": > > - Pre-processing Encode task: video frames are routed directly from > the CSI and can be scaled, color-space converted, and rotated. > Scaled output is limited to 1024x1024 resolution. Output frames > are routed to the camera interface entities (camif). > > - Pre-processing Viewfinder task: this task can perform the same > conversions as the pre-process encode task, but in addition can > be used for hardware motion compensated deinterlacing. Frames can > come either directly from the CSI or from the SMFC entities (memory > buffers via IDMAC channels). Scaled output is limited to 1024x1024 > resolution. Output frames can be routed to various sinks including > the post-processing task entities. > > - Post-processing task: same conversions as pre-process encode. However > this entity sends frames to the i.MX IPU image converter which supports > image tiling, which allows scaled output up to 4096x4096 resolution. > Output frames can be routed to the camera interfaces. > > Signed-off-by: Steve LongerbeamApplying: media: imx: Add IC subdev drivers .git/rebase-apply/patch:3054: new blank line at EOF. + warning: 1 line adds whitespace errors. -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v3 19/24] media: imx: Add IC subdev drivers
On 01/20/2017 06:29 AM, Hans Verkuil wrote: On 01/07/2017 03:11 AM, Steve Longerbeam wrote: + +static const struct v4l2_ctrl_config prpenc_std_ctrl[] = { + { + .id = V4L2_CID_HFLIP, + .name = "Horizontal Flip", + .type = V4L2_CTRL_TYPE_BOOLEAN, + .def = 0, + .min = 0, + .max = 1, + .step = 1, + }, { + .id = V4L2_CID_VFLIP, + .name = "Vertical Flip", + .type = V4L2_CTRL_TYPE_BOOLEAN, + .def = 0, + .min = 0, + .max = 1, + .step = 1, + }, { + .id = V4L2_CID_ROTATE, + .name = "Rotation", + .type = V4L2_CTRL_TYPE_INTEGER, + .def = 0, + .min = 0, + .max = 270, + .step = 90, + }, +}; Use v4l2_ctrl_new_std() instead of this array: this avoids duplicating information like the name and type. If this is also done elsewhere, then it should be changed there as well. done. Steve -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v3 19/24] media: imx: Add IC subdev drivers
On 01/07/2017 03:11 AM, Steve Longerbeam wrote: > This is a set of three media entity subdevice drivers for the i.MX > Image Converter. The i.MX IC module contains three independent > "tasks": > > - Pre-processing Encode task: video frames are routed directly from > the CSI and can be scaled, color-space converted, and rotated. > Scaled output is limited to 1024x1024 resolution. Output frames > are routed to the camera interface entities (camif). > > - Pre-processing Viewfinder task: this task can perform the same > conversions as the pre-process encode task, but in addition can > be used for hardware motion compensated deinterlacing. Frames can > come either directly from the CSI or from the SMFC entities (memory > buffers via IDMAC channels). Scaled output is limited to 1024x1024 > resolution. Output frames can be routed to various sinks including > the post-processing task entities. > > - Post-processing task: same conversions as pre-process encode. However > this entity sends frames to the i.MX IPU image converter which supports > image tiling, which allows scaled output up to 4096x4096 resolution. > Output frames can be routed to the camera interfaces. > > Signed-off-by: Steve Longerbeam> --- > drivers/staging/media/imx/Makefile|2 + > drivers/staging/media/imx/imx-ic-common.c | 109 +++ > drivers/staging/media/imx/imx-ic-pp.c | 636 > drivers/staging/media/imx/imx-ic-prpenc.c | 1033 + > drivers/staging/media/imx/imx-ic-prpvf.c | 1179 > + > drivers/staging/media/imx/imx-ic.h| 38 + > 6 files changed, 2997 insertions(+) > create mode 100644 drivers/staging/media/imx/imx-ic-common.c > create mode 100644 drivers/staging/media/imx/imx-ic-pp.c > create mode 100644 drivers/staging/media/imx/imx-ic-prpenc.c > create mode 100644 drivers/staging/media/imx/imx-ic-prpvf.c > create mode 100644 drivers/staging/media/imx/imx-ic.h > > diff --git a/drivers/staging/media/imx/Makefile > b/drivers/staging/media/imx/Makefile > index 3559d7b..d2a962c 100644 > --- a/drivers/staging/media/imx/Makefile > +++ b/drivers/staging/media/imx/Makefile > @@ -1,8 +1,10 @@ > imx-media-objs := imx-media-dev.o imx-media-fim.o imx-media-internal-sd.o \ > imx-media-of.o > +imx-ic-objs := imx-ic-common.o imx-ic-prpenc.o imx-ic-prpvf.o imx-ic-pp.o > > obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-media.o > obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-media-common.o > +obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-ic.o > > obj-$(CONFIG_VIDEO_IMX_CAMERA) += imx-csi.o > obj-$(CONFIG_VIDEO_IMX_CAMERA) += imx-smfc.o > diff --git a/drivers/staging/media/imx/imx-ic-common.c > b/drivers/staging/media/imx/imx-ic-common.c > new file mode 100644 > index 000..45706ca > --- /dev/null > +++ b/drivers/staging/media/imx/imx-ic-common.c > @@ -0,0 +1,109 @@ > +/* > + * V4L2 Image Converter Subdev for Freescale i.MX5/6 SOC > + * > + * Copyright (c) 2014-2016 Mentor Graphics Inc. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + */ > +#include > +#include > +#include > +#include > +#include "imx-media.h" > +#include "imx-ic.h" > + > +static struct imx_ic_ops *ic_ops[IC_NUM_TASKS] = { > + [IC_TASK_ENCODER]= _ic_prpenc_ops, > + [IC_TASK_VIEWFINDER] = _ic_prpvf_ops, > + [IC_TASK_POST_PROCESSOR] = _ic_pp_ops, > +}; > + > +static int imx_ic_probe(struct platform_device *pdev) > +{ > + struct imx_media_internal_sd_platformdata *pdata; > + struct imx_ic_priv *priv; > + int ret; > + > + priv = devm_kzalloc(>dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + platform_set_drvdata(pdev, >sd); > + priv->dev = >dev; > + > + /* get our ipu_id, grp_id and IC task id */ > + pdata = priv->dev->platform_data; > + priv->ipu_id = pdata->ipu_id; > + switch (pdata->grp_id) { > + case IMX_MEDIA_GRP_ID_IC_PRPENC: > + priv->task_id = IC_TASK_ENCODER; > + break; > + case IMX_MEDIA_GRP_ID_IC_PRPVF: > + priv->task_id = IC_TASK_VIEWFINDER; > + break; > + case IMX_MEDIA_GRP_ID_IC_PP0...IMX_MEDIA_GRP_ID_IC_PP3: > + priv->task_id = IC_TASK_POST_PROCESSOR; > + break; > + default: > + return -EINVAL; > + } > + > + v4l2_subdev_init(>sd, ic_ops[priv->task_id]->subdev_ops); > + v4l2_set_subdevdata(>sd, priv); > + priv->sd.internal_ops = ic_ops[priv->task_id]->internal_ops; > + priv->sd.entity.ops = ic_ops[priv->task_id]->entity_ops; > + priv->sd.entity.function = MEDIA_ENT_F_PROC_VIDEO_SCALER; > + priv->sd.dev = >dev; > + priv->sd.owner = THIS_MODULE; > + priv->sd.flags =