@@ -4,7 +4,7 @@ imx-media-common-objs := imx-media-capture.o imx-media-dev-common.o \
imx6-media-objs := imx-media-dev.o imx-media-internal-sd.o \
imx-ic-common.o imx-ic-prp.o imx-ic-prpencvf.o imx-media-vdic.o \
- imx-media-csc-scaler.o
+ imx-media-mem2mem-vdic.o imx-media-csc-scaler.o
imx6-media-csi-objs := imx-media-csi.o imx-media-fim.o
@@ -57,7 +57,47 @@ static int imx6_media_probe_complete(struct v4l2_async_notifier *notifier)
goto unlock;
}
+ imxmd->m2m_vdic[0] = imx_media_mem2mem_vdic_init(imxmd, 0);
+ if (IS_ERR(imxmd->m2m_vdic[0])) {
+ ret = PTR_ERR(imxmd->m2m_vdic[0]);
+ imxmd->m2m_vdic[0] = NULL;
+ goto unlock;
+ }
+
+ /* MX6S/DL has one IPUv3, init second VDI only on MX6Q/QP */
+ if (imxmd->ipu[1]) {
+ imxmd->m2m_vdic[1] = imx_media_mem2mem_vdic_init(imxmd, 1);
+ if (IS_ERR(imxmd->m2m_vdic[1])) {
+ ret = PTR_ERR(imxmd->m2m_vdic[1]);
+ imxmd->m2m_vdic[1] = NULL;
+ goto unlock;
+ }
+ }
+
ret = imx_media_csc_scaler_device_register(imxmd->m2m_vdev);
+ if (ret)
+ goto unlock;
+
+ ret = imx_media_mem2mem_vdic_register(imxmd->m2m_vdic[0]);
+ if (ret)
+ goto unreg_csc;
+
+ /* MX6S/DL has one IPUv3, init second VDI only on MX6Q/QP */
+ if (imxmd->ipu[1]) {
+ ret = imx_media_mem2mem_vdic_register(imxmd->m2m_vdic[1]);
+ if (ret)
+ goto unreg_vdic;
+ }
+
+ mutex_unlock(&imxmd->mutex);
+ return ret;
+
+unreg_vdic:
+ imx_media_mem2mem_vdic_unregister(imxmd->m2m_vdic[0]);
+ imxmd->m2m_vdic[0] = NULL;
+unreg_csc:
+ imx_media_csc_scaler_device_unregister(imxmd->m2m_vdev);
+ imxmd->m2m_vdev = NULL;
unlock:
mutex_unlock(&imxmd->mutex);
return ret;
@@ -108,6 +148,16 @@ static void imx_media_remove(struct platform_device *pdev)
v4l2_info(&imxmd->v4l2_dev, "Removing imx-media\n");
+ if (imxmd->m2m_vdic[1]) { /* MX6Q/QP only */
+ imx_media_mem2mem_vdic_unregister(imxmd->m2m_vdic[1]);
+ imxmd->m2m_vdic[1] = NULL;
+ }
+
+ if (imxmd->m2m_vdic[0]) {
+ imx_media_mem2mem_vdic_unregister(imxmd->m2m_vdic[0]);
+ imxmd->m2m_vdic[0] = NULL;
+ }
+
if (imxmd->m2m_vdev) {
imx_media_csc_scaler_device_unregister(imxmd->m2m_vdev);
imxmd->m2m_vdev = NULL;
new file mode 100644
@@ -0,0 +1,992 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * i.MX VDIC mem2mem de-interlace driver
+ *
+ * Copyright (c) 2024 Marek Vasut <marex@denx.de>
+ *
+ * Based on previous VDIC mem2mem work by Steve Longerbeam that is:
+ * Copyright (c) 2018 Mentor Graphics Inc.
+ */
+
+#include <linux/delay.h>
+#include <linux/fs.h>
+#include <linux/module.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/version.h>
+
+#include <media/media-device.h>
+#include <media/v4l2-ctrls.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-event.h>
+#include <media/v4l2-ioctl.h>
+#include <media/v4l2-mem2mem.h>
+#include <media/videobuf2-dma-contig.h>
+
+#include "imx-media.h"
+
+#define fh_to_ctx(__fh) container_of(__fh, struct ipu_mem2mem_vdic_ctx, fh)
+
+#define to_mem2mem_priv(v) container_of(v, struct ipu_mem2mem_vdic_priv, vdev)
+
+enum {
+ V4L2_M2M_SRC = 0,
+ V4L2_M2M_DST = 1,
+};
+
+struct ipu_mem2mem_vdic_ctx;
+
+struct ipu_mem2mem_vdic_priv {
+ struct imx_media_video_dev vdev;
+ struct imx_media_dev *md;
+ struct device *dev;
+ struct ipu_soc *ipu_dev;
+ int ipu_id;
+
+ struct v4l2_m2m_dev *m2m_dev;
+ struct mutex mutex; /* mem2mem device mutex */
+
+ /* VDI resources */
+ struct ipu_vdi *vdi;
+ struct ipu_ic *ic;
+ struct ipuv3_channel *vdi_in_ch_p;
+ struct ipuv3_channel *vdi_in_ch;
+ struct ipuv3_channel *vdi_in_ch_n;
+ struct ipuv3_channel *vdi_out_ch;
+ int eof_irq;
+ int nfb4eof_irq;
+ spinlock_t irqlock; /* protect eof_irq handler */
+
+ atomic_t stream_count;
+
+ struct ipu_mem2mem_vdic_ctx *curr_ctx;
+
+ struct v4l2_pix_format fmt[2];
+};
+
+struct ipu_mem2mem_vdic_ctx {
+ struct ipu_mem2mem_vdic_priv *priv;
+ struct v4l2_fh fh;
+ unsigned int sequence;
+ struct vb2_v4l2_buffer *prev_buf;
+ struct vb2_v4l2_buffer *curr_buf;
+};
+
+static struct v4l2_pix_format *
+ipu_mem2mem_vdic_get_format(struct ipu_mem2mem_vdic_priv *priv,
+ enum v4l2_buf_type type)
+{
+ return &priv->fmt[V4L2_TYPE_IS_OUTPUT(type) ? V4L2_M2M_SRC : V4L2_M2M_DST];
+}
+
+static bool ipu_mem2mem_vdic_format_is_yuv420(const u32 pixelformat)
+{
+ /* All 4:2:0 subsampled formats supported by this hardware */
+ return pixelformat == V4L2_PIX_FMT_YUV420 ||
+ pixelformat == V4L2_PIX_FMT_YVU420 ||
+ pixelformat == V4L2_PIX_FMT_NV12;
+}
+
+static bool ipu_mem2mem_vdic_format_is_yuv422(const u32 pixelformat)
+{
+ /* All 4:2:2 subsampled formats supported by this hardware */
+ return pixelformat == V4L2_PIX_FMT_UYVY ||
+ pixelformat == V4L2_PIX_FMT_YUYV ||
+ pixelformat == V4L2_PIX_FMT_YUV422P ||
+ pixelformat == V4L2_PIX_FMT_NV16;
+}
+
+static bool ipu_mem2mem_vdic_format_is_yuv(const u32 pixelformat)
+{
+ return ipu_mem2mem_vdic_format_is_yuv420(pixelformat) ||
+ ipu_mem2mem_vdic_format_is_yuv422(pixelformat);
+}
+
+static bool ipu_mem2mem_vdic_format_is_rgb16(const u32 pixelformat)
+{
+ /* All 16-bit RGB formats supported by this hardware */
+ return pixelformat == V4L2_PIX_FMT_RGB565;
+}
+
+static bool ipu_mem2mem_vdic_format_is_rgb24(const u32 pixelformat)
+{
+ /* All 24-bit RGB formats supported by this hardware */
+ return pixelformat == V4L2_PIX_FMT_RGB24 ||
+ pixelformat == V4L2_PIX_FMT_BGR24;
+}
+
+static bool ipu_mem2mem_vdic_format_is_rgb32(const u32 pixelformat)
+{
+ /* All 32-bit RGB formats supported by this hardware */
+ return pixelformat == V4L2_PIX_FMT_XRGB32 ||
+ pixelformat == V4L2_PIX_FMT_XBGR32 ||
+ pixelformat == V4L2_PIX_FMT_BGRX32 ||
+ pixelformat == V4L2_PIX_FMT_RGBX32;
+}
+
+/*
+ * mem2mem callbacks
+ */
+static irqreturn_t ipu_mem2mem_vdic_eof_interrupt(int irq, void *dev_id)
+{
+ struct ipu_mem2mem_vdic_priv *priv = dev_id;
+ struct ipu_mem2mem_vdic_ctx *ctx = priv->curr_ctx;
+ struct vb2_v4l2_buffer *src_buf, *dst_buf;
+
+ spin_lock(&priv->irqlock);
+
+ src_buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
+ dst_buf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
+
+ v4l2_m2m_buf_copy_metadata(src_buf, dst_buf, true);
+
+ src_buf->sequence = ctx->sequence++;
+ dst_buf->sequence = src_buf->sequence;
+
+ v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_DONE);
+ v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_DONE);
+
+ v4l2_m2m_job_finish(priv->m2m_dev, ctx->fh.m2m_ctx);
+
+ spin_unlock(&priv->irqlock);
+
+ return IRQ_HANDLED;
+}
+
+static irqreturn_t ipu_mem2mem_vdic_nfb4eof_interrupt(int irq, void *dev_id)
+{
+ struct ipu_mem2mem_vdic_priv *priv = dev_id;
+
+ /* That is about all we can do about it, report it. */
+ dev_warn_ratelimited(priv->dev, "NFB4EOF error interrupt occurred\n");
+
+ return IRQ_HANDLED;
+}
+
+static void ipu_mem2mem_vdic_device_run(void *_ctx)
+{
+ struct ipu_mem2mem_vdic_ctx *ctx = _ctx;
+ struct ipu_mem2mem_vdic_priv *priv = ctx->priv;
+ struct vb2_v4l2_buffer *curr_buf, *dst_buf;
+ dma_addr_t prev_phys, curr_phys, out_phys;
+ struct v4l2_pix_format *infmt;
+ u32 phys_offset = 0;
+ unsigned long flags;
+ int ret;
+
+ infmt = ipu_mem2mem_vdic_get_format(priv, V4L2_BUF_TYPE_VIDEO_OUTPUT);
+ if (V4L2_FIELD_IS_SEQUENTIAL(infmt->field))
+ phys_offset = infmt->sizeimage / 2;
+ else if (V4L2_FIELD_IS_INTERLACED(infmt->field))
+ phys_offset = infmt->bytesperline;
+ else
+ dev_err(priv->dev, "Invalid field %d\n", infmt->field);
+
+ dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
+ out_phys = vb2_dma_contig_plane_dma_addr(&dst_buf->vb2_buf, 0);
+
+ curr_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
+ if (!curr_buf) {
+ dev_err(priv->dev, "Not enough buffers %d\n", ret);
+ return;
+ }
+
+ spin_lock_irqsave(&priv->irqlock, flags);
+
+ if (ctx->curr_buf) {
+ ctx->prev_buf = ctx->curr_buf;
+ ctx->curr_buf = curr_buf;
+ } else {
+ ctx->prev_buf = curr_buf;
+ ctx->curr_buf = curr_buf;
+ dev_warn(priv->dev, "Single-buffer mode, fix your userspace\n");
+ }
+
+ prev_phys = vb2_dma_contig_plane_dma_addr(&ctx->prev_buf->vb2_buf, 0);
+ curr_phys = vb2_dma_contig_plane_dma_addr(&ctx->curr_buf->vb2_buf, 0);
+
+ priv->curr_ctx = ctx;
+ spin_unlock_irqrestore(&priv->irqlock, flags);
+
+ ipu_cpmem_set_buffer(priv->vdi_out_ch, 0, out_phys);
+ ipu_cpmem_set_buffer(priv->vdi_in_ch_p, 0, prev_phys + phys_offset);
+ ipu_cpmem_set_buffer(priv->vdi_in_ch, 0, curr_phys);
+ ipu_cpmem_set_buffer(priv->vdi_in_ch_n, 0, curr_phys + phys_offset);
+
+ /* No double buffering, always pick buffer 0 */
+ ipu_idmac_select_buffer(priv->vdi_out_ch, 0);
+ ipu_idmac_select_buffer(priv->vdi_in_ch_p, 0);
+ ipu_idmac_select_buffer(priv->vdi_in_ch, 0);
+ ipu_idmac_select_buffer(priv->vdi_in_ch_n, 0);
+
+ /* Enable the channels */
+ ipu_idmac_enable_channel(priv->vdi_out_ch);
+ ipu_idmac_enable_channel(priv->vdi_in_ch_p);
+ ipu_idmac_enable_channel(priv->vdi_in_ch);
+ ipu_idmac_enable_channel(priv->vdi_in_ch_n);
+}
+
+/*
+ * Video ioctls
+ */
+static int ipu_mem2mem_vdic_querycap(struct file *file, void *priv,
+ struct v4l2_capability *cap)
+{
+ strscpy(cap->driver, "imx-m2m-vdic", sizeof(cap->driver));
+ strscpy(cap->card, "imx-m2m-vdic", sizeof(cap->card));
+ strscpy(cap->bus_info, "platform:imx-m2m-vdic", sizeof(cap->bus_info));
+ cap->device_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;
+ cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
+
+ return 0;
+}
+
+static int ipu_mem2mem_vdic_enum_fmt(struct file *file, void *fh, struct v4l2_fmtdesc *f)
+{
+ struct ipu_mem2mem_vdic_ctx *ctx = fh_to_ctx(fh);
+ struct vb2_queue *vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type);
+ enum imx_pixfmt_sel cs = vq->type == V4L2_BUF_TYPE_VIDEO_CAPTURE ?
+ PIXFMT_SEL_YUV_RGB : PIXFMT_SEL_YUV;
+ u32 fourcc;
+ int ret;
+
+ ret = imx_media_enum_pixel_formats(&fourcc, f->index, cs, 0);
+ if (ret)
+ return ret;
+
+ f->pixelformat = fourcc;
+
+ return 0;
+}
+
+static int ipu_mem2mem_vdic_g_fmt(struct file *file, void *fh, struct v4l2_format *f)
+{
+ struct ipu_mem2mem_vdic_ctx *ctx = fh_to_ctx(fh);
+ struct ipu_mem2mem_vdic_priv *priv = ctx->priv;
+ struct v4l2_pix_format *fmt = ipu_mem2mem_vdic_get_format(priv, f->type);
+
+ f->fmt.pix = *fmt;
+
+ return 0;
+}
+
+static int ipu_mem2mem_vdic_try_fmt(struct file *file, void *fh,
+ struct v4l2_format *f)
+{
+ const struct imx_media_pixfmt *cc;
+ enum imx_pixfmt_sel cs;
+ u32 fourcc;
+
+ if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) { /* Output */
+ cs = PIXFMT_SEL_YUV_RGB; /* YUV direct / RGB via IC */
+
+ f->fmt.pix.field = V4L2_FIELD_NONE;
+ } else {
+ cs = PIXFMT_SEL_YUV; /* YUV input only */
+
+ /*
+ * Input must be interlaced with frame order.
+ * Fall back to SEQ_TB otherwise.
+ */
+ if (!V4L2_FIELD_HAS_BOTH(f->fmt.pix.field) ||
+ f->fmt.pix.field == V4L2_FIELD_INTERLACED)
+ f->fmt.pix.field = V4L2_FIELD_SEQ_TB;
+ }
+
+ fourcc = f->fmt.pix.pixelformat;
+ cc = imx_media_find_pixel_format(fourcc, cs);
+ if (!cc) {
+ imx_media_enum_pixel_formats(&fourcc, 0, cs, 0);
+ cc = imx_media_find_pixel_format(fourcc, cs);
+ }
+
+ f->fmt.pix.pixelformat = cc->fourcc;
+
+ v4l_bound_align_image(&f->fmt.pix.width,
+ 1, 968, 1,
+ &f->fmt.pix.height,
+ 1, 1024, 1, 1);
+
+ if (ipu_mem2mem_vdic_format_is_yuv420(f->fmt.pix.pixelformat))
+ f->fmt.pix.bytesperline = f->fmt.pix.width * 3 / 2;
+ else if (ipu_mem2mem_vdic_format_is_yuv422(f->fmt.pix.pixelformat))
+ f->fmt.pix.bytesperline = f->fmt.pix.width * 2;
+ else if (ipu_mem2mem_vdic_format_is_rgb16(f->fmt.pix.pixelformat))
+ f->fmt.pix.bytesperline = f->fmt.pix.width * 2;
+ else if (ipu_mem2mem_vdic_format_is_rgb24(f->fmt.pix.pixelformat))
+ f->fmt.pix.bytesperline = f->fmt.pix.width * 3;
+ else if (ipu_mem2mem_vdic_format_is_rgb32(f->fmt.pix.pixelformat))
+ f->fmt.pix.bytesperline = f->fmt.pix.width * 4;
+ else
+ f->fmt.pix.bytesperline = f->fmt.pix.width;
+
+ f->fmt.pix.sizeimage = f->fmt.pix.height * f->fmt.pix.bytesperline;
+
+ return 0;
+}
+
+static int ipu_mem2mem_vdic_s_fmt(struct file *file, void *fh, struct v4l2_format *f)
+{
+ struct ipu_mem2mem_vdic_ctx *ctx = fh_to_ctx(fh);
+ struct ipu_mem2mem_vdic_priv *priv = ctx->priv;
+ struct v4l2_pix_format *fmt, *infmt, *outfmt;
+ struct vb2_queue *vq;
+ int ret;
+
+ vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type);
+ if (vb2_is_busy(vq)) {
+ dev_err(priv->dev, "%s queue busy\n", __func__);
+ return -EBUSY;
+ }
+
+ ret = ipu_mem2mem_vdic_try_fmt(file, fh, f);
+ if (ret < 0)
+ return ret;
+
+ fmt = ipu_mem2mem_vdic_get_format(priv, f->type);
+ *fmt = f->fmt.pix;
+
+ /* Propagate colorimetry to the capture queue */
+ infmt = ipu_mem2mem_vdic_get_format(priv, V4L2_BUF_TYPE_VIDEO_OUTPUT);
+ outfmt = ipu_mem2mem_vdic_get_format(priv, V4L2_BUF_TYPE_VIDEO_CAPTURE);
+ outfmt->colorspace = infmt->colorspace;
+ outfmt->ycbcr_enc = infmt->ycbcr_enc;
+ outfmt->xfer_func = infmt->xfer_func;
+ outfmt->quantization = infmt->quantization;
+
+ return 0;
+}
+
+static const struct v4l2_ioctl_ops mem2mem_ioctl_ops = {
+ .vidioc_querycap = ipu_mem2mem_vdic_querycap,
+
+ .vidioc_enum_fmt_vid_cap = ipu_mem2mem_vdic_enum_fmt,
+ .vidioc_g_fmt_vid_cap = ipu_mem2mem_vdic_g_fmt,
+ .vidioc_try_fmt_vid_cap = ipu_mem2mem_vdic_try_fmt,
+ .vidioc_s_fmt_vid_cap = ipu_mem2mem_vdic_s_fmt,
+
+ .vidioc_enum_fmt_vid_out = ipu_mem2mem_vdic_enum_fmt,
+ .vidioc_g_fmt_vid_out = ipu_mem2mem_vdic_g_fmt,
+ .vidioc_try_fmt_vid_out = ipu_mem2mem_vdic_try_fmt,
+ .vidioc_s_fmt_vid_out = ipu_mem2mem_vdic_s_fmt,
+
+ .vidioc_reqbufs = v4l2_m2m_ioctl_reqbufs,
+ .vidioc_querybuf = v4l2_m2m_ioctl_querybuf,
+
+ .vidioc_qbuf = v4l2_m2m_ioctl_qbuf,
+ .vidioc_expbuf = v4l2_m2m_ioctl_expbuf,
+ .vidioc_dqbuf = v4l2_m2m_ioctl_dqbuf,
+ .vidioc_create_bufs = v4l2_m2m_ioctl_create_bufs,
+
+ .vidioc_streamon = v4l2_m2m_ioctl_streamon,
+ .vidioc_streamoff = v4l2_m2m_ioctl_streamoff,
+
+ .vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
+ .vidioc_unsubscribe_event = v4l2_event_unsubscribe,
+};
+
+/*
+ * Queue operations
+ */
+static int ipu_mem2mem_vdic_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
+ unsigned int *nplanes, unsigned int sizes[],
+ struct device *alloc_devs[])
+{
+ struct ipu_mem2mem_vdic_ctx *ctx = vb2_get_drv_priv(vq);
+ struct ipu_mem2mem_vdic_priv *priv = ctx->priv;
+ struct v4l2_pix_format *fmt = ipu_mem2mem_vdic_get_format(priv, vq->type);
+ unsigned int count = *nbuffers;
+
+ *nbuffers = count;
+
+ if (*nplanes)
+ return sizes[0] < fmt->sizeimage ? -EINVAL : 0;
+
+ *nplanes = 1;
+ sizes[0] = fmt->sizeimage;
+
+ dev_dbg(ctx->priv->dev, "get %d buffer(s) of size %d each.\n",
+ count, fmt->sizeimage);
+
+ return 0;
+}
+
+static int ipu_mem2mem_vdic_buf_prepare(struct vb2_buffer *vb)
+{
+ struct ipu_mem2mem_vdic_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
+ struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+ struct ipu_mem2mem_vdic_priv *priv = ctx->priv;
+ struct vb2_queue *vq = vb->vb2_queue;
+ struct v4l2_pix_format *fmt;
+ unsigned long size;
+
+ dev_dbg(ctx->priv->dev, "type: %d\n", vb->vb2_queue->type);
+
+ if (V4L2_TYPE_IS_OUTPUT(vq->type)) {
+ if (vbuf->field == V4L2_FIELD_ANY)
+ vbuf->field = V4L2_FIELD_SEQ_TB;
+ if (!V4L2_FIELD_HAS_BOTH(vbuf->field)) {
+ dev_dbg(ctx->priv->dev, "%s: field isn't supported\n",
+ __func__);
+ return -EINVAL;
+ }
+ }
+
+ fmt = ipu_mem2mem_vdic_get_format(priv, vb->vb2_queue->type);
+ size = fmt->sizeimage;
+
+ if (vb2_plane_size(vb, 0) < size) {
+ dev_dbg(ctx->priv->dev,
+ "%s: data will not fit into plane (%lu < %lu)\n",
+ __func__, vb2_plane_size(vb, 0), size);
+ return -EINVAL;
+ }
+
+ vb2_set_plane_payload(vb, 0, fmt->sizeimage);
+
+ return 0;
+}
+
+static void ipu_mem2mem_vdic_buf_queue(struct vb2_buffer *vb)
+{
+ struct ipu_mem2mem_vdic_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
+
+ v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, to_vb2_v4l2_buffer(vb));
+}
+
+/* VDIC hardware setup */
+static int ipu_mem2mem_vdic_setup_channel(struct ipu_mem2mem_vdic_priv *priv,
+ struct ipuv3_channel *channel,
+ struct v4l2_pix_format *fmt,
+ bool in)
+{
+ struct ipu_image image = { 0 };
+ unsigned int burst_size;
+ int ret;
+
+ image.pix = *fmt;
+ image.rect.width = image.pix.width;
+ image.rect.height = image.pix.height;
+
+ ipu_cpmem_zero(channel);
+
+ if (in) {
+ /* One field to VDIC channels */
+ image.pix.height /= 2;
+ image.rect.height /= 2;
+ } else {
+ /* Skip writing U and V components to odd rows */
+ if (ipu_mem2mem_vdic_format_is_yuv420(image.pix.pixelformat))
+ ipu_cpmem_skip_odd_chroma_rows(channel);
+ }
+
+ ret = ipu_cpmem_set_image(channel, &image);
+ if (ret)
+ return ret;
+
+ burst_size = (image.pix.width & 0xf) ? 8 : 16;
+ ipu_cpmem_set_burstsize(channel, burst_size);
+
+ if (!ipu_prg_present(priv->ipu_dev))
+ ipu_cpmem_set_axi_id(channel, 1);
+
+ ipu_idmac_set_double_buffer(channel, false);
+
+ return 0;
+}
+
+static int ipu_mem2mem_vdic_setup_hardware(struct ipu_mem2mem_vdic_priv *priv)
+{
+ struct v4l2_pix_format *infmt, *outfmt;
+ struct ipu_ic_csc csc;
+ bool in422, outyuv;
+ int ret;
+
+ infmt = ipu_mem2mem_vdic_get_format(priv, V4L2_BUF_TYPE_VIDEO_OUTPUT);
+ outfmt = ipu_mem2mem_vdic_get_format(priv, V4L2_BUF_TYPE_VIDEO_CAPTURE);
+ in422 = ipu_mem2mem_vdic_format_is_yuv422(infmt->pixelformat);
+ outyuv = ipu_mem2mem_vdic_format_is_yuv(outfmt->pixelformat);
+
+ ipu_vdi_setup(priv->vdi, in422, infmt->width, infmt->height);
+ ipu_vdi_set_field_order(priv->vdi, V4L2_STD_UNKNOWN, infmt->field);
+ ipu_vdi_set_motion(priv->vdi, HIGH_MOTION);
+
+ /* Initialize the VDI IDMAC channels */
+ ret = ipu_mem2mem_vdic_setup_channel(priv, priv->vdi_in_ch_p, infmt, true);
+ if (ret)
+ return ret;
+
+ ret = ipu_mem2mem_vdic_setup_channel(priv, priv->vdi_in_ch, infmt, true);
+ if (ret)
+ return ret;
+
+ ret = ipu_mem2mem_vdic_setup_channel(priv, priv->vdi_in_ch_n, infmt, true);
+ if (ret)
+ return ret;
+
+ ret = ipu_mem2mem_vdic_setup_channel(priv, priv->vdi_out_ch, outfmt, false);
+ if (ret)
+ return ret;
+
+ ret = ipu_ic_calc_csc(&csc,
+ infmt->ycbcr_enc, infmt->quantization,
+ IPUV3_COLORSPACE_YUV,
+ outfmt->ycbcr_enc, outfmt->quantization,
+ outyuv ? IPUV3_COLORSPACE_YUV :
+ IPUV3_COLORSPACE_RGB);
+ if (ret)
+ return ret;
+
+ /* Enable the IC */
+ ipu_ic_task_init(priv->ic, &csc,
+ infmt->width, infmt->height,
+ outfmt->width, outfmt->height);
+ ipu_ic_task_idma_init(priv->ic, priv->vdi_out_ch,
+ infmt->width, infmt->height, 16, 0);
+ ipu_ic_enable(priv->ic);
+ ipu_ic_task_enable(priv->ic);
+
+ /* Enable the VDI */
+ ipu_vdi_enable(priv->vdi);
+
+ return 0;
+}
+
+static struct vb2_queue *ipu_mem2mem_vdic_get_other_q(struct vb2_queue *q)
+{
+ struct ipu_mem2mem_vdic_ctx *ctx = vb2_get_drv_priv(q);
+ enum v4l2_buf_type type = q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE ?
+ V4L2_BUF_TYPE_VIDEO_OUTPUT :
+ V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+ return v4l2_m2m_get_vq(ctx->fh.m2m_ctx, type);
+}
+
+static void ipu_mem2mem_vdic_return_bufs(struct vb2_queue *q)
+{
+ struct ipu_mem2mem_vdic_ctx *ctx = vb2_get_drv_priv(q);
+ struct vb2_v4l2_buffer *buf;
+
+ if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
+ while ((buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx)))
+ v4l2_m2m_buf_done(buf, VB2_BUF_STATE_QUEUED);
+ else
+ while ((buf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx)))
+ v4l2_m2m_buf_done(buf, VB2_BUF_STATE_QUEUED);
+}
+
+static int ipu_mem2mem_vdic_start_streaming(struct vb2_queue *q, unsigned int count)
+{
+ struct vb2_queue *other_q = ipu_mem2mem_vdic_get_other_q(q);
+ struct ipu_mem2mem_vdic_ctx *ctx = vb2_get_drv_priv(q);
+ struct ipu_mem2mem_vdic_priv *priv = ctx->priv;
+ int ret;
+
+ if (!vb2_is_streaming(other_q))
+ return 0;
+
+ /* Already streaming, do not reconfigure the VDI. */
+ if (atomic_inc_return(&priv->stream_count) != 1)
+ return 0;
+
+ /* Start streaming */
+ ret = ipu_mem2mem_vdic_setup_hardware(priv);
+ if (ret)
+ ipu_mem2mem_vdic_return_bufs(q);
+
+ return ret;
+}
+
+static void ipu_mem2mem_vdic_stop_streaming(struct vb2_queue *q)
+{
+ struct vb2_queue *other_q = ipu_mem2mem_vdic_get_other_q(q);
+ struct ipu_mem2mem_vdic_ctx *ctx = vb2_get_drv_priv(q);
+ struct ipu_mem2mem_vdic_priv *priv = ctx->priv;
+
+ if (vb2_is_streaming(other_q)) {
+ ipu_mem2mem_vdic_return_bufs(q);
+ return;
+ }
+
+ if (atomic_dec_return(&priv->stream_count) == 0) {
+ /* Stop streaming */
+ ipu_idmac_disable_channel(priv->vdi_in_ch_p);
+ ipu_idmac_disable_channel(priv->vdi_in_ch);
+ ipu_idmac_disable_channel(priv->vdi_in_ch_n);
+ ipu_idmac_disable_channel(priv->vdi_out_ch);
+
+ ipu_vdi_disable(priv->vdi);
+ ipu_ic_task_disable(priv->ic);
+ ipu_ic_disable(priv->ic);
+ }
+
+ ctx->sequence = 0;
+
+ ipu_mem2mem_vdic_return_bufs(q);
+}
+
+static const struct vb2_ops mem2mem_qops = {
+ .queue_setup = ipu_mem2mem_vdic_queue_setup,
+ .buf_prepare = ipu_mem2mem_vdic_buf_prepare,
+ .buf_queue = ipu_mem2mem_vdic_buf_queue,
+ .wait_prepare = vb2_ops_wait_prepare,
+ .wait_finish = vb2_ops_wait_finish,
+ .start_streaming = ipu_mem2mem_vdic_start_streaming,
+ .stop_streaming = ipu_mem2mem_vdic_stop_streaming,
+};
+
+static int ipu_mem2mem_vdic_queue_init(void *priv, struct vb2_queue *src_vq,
+ struct vb2_queue *dst_vq)
+{
+ struct ipu_mem2mem_vdic_ctx *ctx = priv;
+ int ret;
+
+ memset(src_vq, 0, sizeof(*src_vq));
+ src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
+ src_vq->io_modes = VB2_MMAP | VB2_DMABUF;
+ src_vq->drv_priv = ctx;
+ src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
+ src_vq->ops = &mem2mem_qops;
+ src_vq->mem_ops = &vb2_dma_contig_memops;
+ src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+ src_vq->lock = &ctx->priv->mutex;
+ src_vq->dev = ctx->priv->dev;
+
+ ret = vb2_queue_init(src_vq);
+ if (ret)
+ return ret;
+
+ memset(dst_vq, 0, sizeof(*dst_vq));
+ dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+ dst_vq->io_modes = VB2_MMAP | VB2_DMABUF;
+ dst_vq->drv_priv = ctx;
+ dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
+ dst_vq->ops = &mem2mem_qops;
+ dst_vq->mem_ops = &vb2_dma_contig_memops;
+ dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+ dst_vq->lock = &ctx->priv->mutex;
+ dst_vq->dev = ctx->priv->dev;
+
+ return vb2_queue_init(dst_vq);
+}
+
+#define DEFAULT_WIDTH 720
+#define DEFAULT_HEIGHT 576
+static const struct v4l2_pix_format ipu_mem2mem_vdic_default = {
+ .width = DEFAULT_WIDTH,
+ .height = DEFAULT_HEIGHT,
+ .pixelformat = V4L2_PIX_FMT_YUV420,
+ .field = V4L2_FIELD_SEQ_TB,
+ .bytesperline = DEFAULT_WIDTH,
+ .sizeimage = DEFAULT_WIDTH * DEFAULT_HEIGHT * 3 / 2,
+ .colorspace = V4L2_COLORSPACE_SRGB,
+ .ycbcr_enc = V4L2_YCBCR_ENC_601,
+ .xfer_func = V4L2_XFER_FUNC_DEFAULT,
+ .quantization = V4L2_QUANTIZATION_DEFAULT,
+};
+
+/*
+ * File operations
+ */
+static int ipu_mem2mem_vdic_open(struct file *file)
+{
+ struct ipu_mem2mem_vdic_priv *priv = video_drvdata(file);
+ struct ipu_mem2mem_vdic_ctx *ctx = NULL;
+ int ret;
+
+ ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
+ if (!ctx)
+ return -ENOMEM;
+
+ v4l2_fh_init(&ctx->fh, video_devdata(file));
+ file->private_data = &ctx->fh;
+ v4l2_fh_add(&ctx->fh);
+ ctx->priv = priv;
+
+ ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(priv->m2m_dev, ctx,
+ &ipu_mem2mem_vdic_queue_init);
+ if (IS_ERR(ctx->fh.m2m_ctx)) {
+ ret = PTR_ERR(ctx->fh.m2m_ctx);
+ goto err_ctx;
+ }
+
+ dev_dbg(priv->dev, "Created instance %p, m2m_ctx: %p\n",
+ ctx, ctx->fh.m2m_ctx);
+
+ return 0;
+
+err_ctx:
+ v4l2_fh_del(&ctx->fh);
+ v4l2_fh_exit(&ctx->fh);
+ kfree(ctx);
+ return ret;
+}
+
+static int ipu_mem2mem_vdic_release(struct file *file)
+{
+ struct ipu_mem2mem_vdic_priv *priv = video_drvdata(file);
+ struct ipu_mem2mem_vdic_ctx *ctx = fh_to_ctx(file->private_data);
+
+ dev_dbg(priv->dev, "Releasing instance %p\n", ctx);
+
+ v4l2_m2m_ctx_release(ctx->fh.m2m_ctx);
+ v4l2_fh_del(&ctx->fh);
+ v4l2_fh_exit(&ctx->fh);
+ kfree(ctx);
+
+ return 0;
+}
+
+static const struct v4l2_file_operations mem2mem_fops = {
+ .owner = THIS_MODULE,
+ .open = ipu_mem2mem_vdic_open,
+ .release = ipu_mem2mem_vdic_release,
+ .poll = v4l2_m2m_fop_poll,
+ .unlocked_ioctl = video_ioctl2,
+ .mmap = v4l2_m2m_fop_mmap,
+};
+
+static struct v4l2_m2m_ops m2m_ops = {
+ .device_run = ipu_mem2mem_vdic_device_run,
+};
+
+static void ipu_mem2mem_vdic_device_release(struct video_device *vdev)
+{
+ struct ipu_mem2mem_vdic_priv *priv = video_get_drvdata(vdev);
+
+ v4l2_m2m_release(priv->m2m_dev);
+ video_device_release(vdev);
+ kfree(priv);
+}
+
+static const struct video_device mem2mem_template = {
+ .name = "ipu_vdic",
+ .fops = &mem2mem_fops,
+ .ioctl_ops = &mem2mem_ioctl_ops,
+ .minor = -1,
+ .release = ipu_mem2mem_vdic_device_release,
+ .vfl_dir = VFL_DIR_M2M,
+ .tvnorms = V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM,
+ .device_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING,
+};
+
+static int ipu_mem2mem_vdic_get_ipu_resources(struct ipu_mem2mem_vdic_priv *priv,
+ struct video_device *vfd)
+{
+ char *nfbname, *eofname;
+ int ret;
+
+ nfbname = devm_kasprintf(priv->dev, GFP_KERNEL, "%s_nfb4eof:%u",
+ vfd->name, priv->ipu_id);
+ if (!nfbname)
+ return -ENOMEM;
+
+ eofname = devm_kasprintf(priv->dev, GFP_KERNEL, "%s_eof:%u",
+ vfd->name, priv->ipu_id);
+ if (!eofname)
+ goto err_eof;
+
+ priv->vdi = ipu_vdi_get(priv->ipu_dev);
+ if (IS_ERR(priv->vdi)) {
+ ret = PTR_ERR(priv->vdi);
+ goto err_vdi;
+ }
+
+ priv->ic = ipu_ic_get(priv->ipu_dev, IC_TASK_VIEWFINDER);
+ if (IS_ERR(priv->ic)) {
+ ret = PTR_ERR(priv->ic);
+ goto err_ic;
+ }
+
+ priv->vdi_in_ch_p = ipu_idmac_get(priv->ipu_dev,
+ IPUV3_CHANNEL_MEM_VDI_PREV);
+ if (IS_ERR(priv->vdi_in_ch_p)) {
+ ret = PTR_ERR(priv->vdi_in_ch_p);
+ goto err_prev;
+ }
+
+ priv->vdi_in_ch = ipu_idmac_get(priv->ipu_dev,
+ IPUV3_CHANNEL_MEM_VDI_CUR);
+ if (IS_ERR(priv->vdi_in_ch)) {
+ ret = PTR_ERR(priv->vdi_in_ch);
+ goto err_curr;
+ }
+
+ priv->vdi_in_ch_n = ipu_idmac_get(priv->ipu_dev,
+ IPUV3_CHANNEL_MEM_VDI_NEXT);
+ if (IS_ERR(priv->vdi_in_ch_n)) {
+ ret = PTR_ERR(priv->vdi_in_ch_n);
+ goto err_next;
+ }
+
+ priv->vdi_out_ch = ipu_idmac_get(priv->ipu_dev,
+ IPUV3_CHANNEL_IC_PRP_VF_MEM);
+ if (IS_ERR(priv->vdi_out_ch)) {
+ ret = PTR_ERR(priv->vdi_out_ch);
+ goto err_out;
+ }
+
+ priv->nfb4eof_irq = ipu_idmac_channel_irq(priv->ipu_dev,
+ priv->vdi_out_ch,
+ IPU_IRQ_NFB4EOF);
+ ret = devm_request_irq(priv->dev, priv->nfb4eof_irq,
+ ipu_mem2mem_vdic_nfb4eof_interrupt, 0,
+ nfbname, priv);
+ if (ret)
+ goto err_irq_nfb4eof;
+
+ priv->eof_irq = ipu_idmac_channel_irq(priv->ipu_dev,
+ priv->vdi_out_ch,
+ IPU_IRQ_EOF);
+ ret = devm_request_irq(priv->dev, priv->eof_irq,
+ ipu_mem2mem_vdic_eof_interrupt, 0,
+ eofname, priv);
+ if (ret)
+ goto err_irq_eof;
+
+ /*
+ * Enable PRG, without PRG clock enabled (CCGR6:prg_clk_enable[0]
+ * and CCGR6:prg_clk_enable[1]), the VDI does not produce any
+ * interrupts at all.
+ */
+ if (ipu_prg_present(priv->ipu_dev))
+ ipu_prg_enable(priv->ipu_dev);
+
+ return 0;
+
+err_irq_eof:
+ devm_free_irq(priv->dev, priv->nfb4eof_irq, priv);
+err_irq_nfb4eof:
+ ipu_idmac_put(priv->vdi_out_ch);
+err_out:
+ ipu_idmac_put(priv->vdi_in_ch_n);
+err_next:
+ ipu_idmac_put(priv->vdi_in_ch);
+err_curr:
+ ipu_idmac_put(priv->vdi_in_ch_p);
+err_prev:
+ ipu_ic_put(priv->ic);
+err_ic:
+ ipu_vdi_put(priv->vdi);
+err_vdi:
+ devm_kfree(priv->dev, eofname);
+err_eof:
+ devm_kfree(priv->dev, nfbname);
+ return ret;
+}
+
+static void ipu_mem2mem_vdic_put_ipu_resources(struct ipu_mem2mem_vdic_priv *priv)
+{
+ devm_free_irq(priv->dev, priv->eof_irq, priv);
+ devm_free_irq(priv->dev, priv->nfb4eof_irq, priv);
+ ipu_idmac_put(priv->vdi_out_ch);
+ ipu_idmac_put(priv->vdi_in_ch_n);
+ ipu_idmac_put(priv->vdi_in_ch);
+ ipu_idmac_put(priv->vdi_in_ch_p);
+ ipu_ic_put(priv->ic);
+ ipu_vdi_put(priv->vdi);
+}
+
+int imx_media_mem2mem_vdic_register(struct imx_media_video_dev *vdev)
+{
+ struct ipu_mem2mem_vdic_priv *priv = to_mem2mem_priv(vdev);
+ struct video_device *vfd = vdev->vfd;
+ int ret;
+
+ vfd->v4l2_dev = &priv->md->v4l2_dev;
+
+ ret = ipu_mem2mem_vdic_get_ipu_resources(priv, vfd);
+ if (ret) {
+ v4l2_err(vfd->v4l2_dev, "Failed to get VDIC resources (%d)\n", ret);
+ return ret;
+ }
+
+ ret = video_register_device(vfd, VFL_TYPE_VIDEO, -1);
+ if (ret) {
+ v4l2_err(vfd->v4l2_dev, "Failed to register video device\n");
+ return ret;
+ }
+
+ v4l2_info(vfd->v4l2_dev, "Registered %s as /dev/%s\n", vfd->name,
+ video_device_node_name(vfd));
+
+ return 0;
+}
+
+void imx_media_mem2mem_vdic_unregister(struct imx_media_video_dev *vdev)
+{
+ struct ipu_mem2mem_vdic_priv *priv = to_mem2mem_priv(vdev);
+ struct video_device *vfd = priv->vdev.vfd;
+
+ video_unregister_device(vfd);
+
+ ipu_mem2mem_vdic_put_ipu_resources(priv);
+}
+
+struct imx_media_video_dev *
+imx_media_mem2mem_vdic_init(struct imx_media_dev *md, int ipu_id)
+{
+ struct ipu_mem2mem_vdic_priv *priv;
+ struct video_device *vfd;
+ int ret;
+
+ priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+ if (!priv)
+ return ERR_PTR(-ENOMEM);
+
+ priv->md = md;
+ priv->ipu_id = ipu_id;
+ priv->ipu_dev = md->ipu[ipu_id];
+ priv->dev = md->md.dev;
+
+ mutex_init(&priv->mutex);
+
+ vfd = video_device_alloc();
+ if (!vfd) {
+ ret = -ENOMEM;
+ goto err_vfd;
+ }
+
+ *vfd = mem2mem_template;
+ vfd->lock = &priv->mutex;
+ priv->vdev.vfd = vfd;
+
+ INIT_LIST_HEAD(&priv->vdev.list);
+ spin_lock_init(&priv->irqlock);
+ atomic_set(&priv->stream_count, 0);
+
+ video_set_drvdata(vfd, priv);
+
+ priv->m2m_dev = v4l2_m2m_init(&m2m_ops);
+ if (IS_ERR(priv->m2m_dev)) {
+ ret = PTR_ERR(priv->m2m_dev);
+ v4l2_err(&md->v4l2_dev, "Failed to init mem2mem device: %d\n",
+ ret);
+ goto err_m2m;
+ }
+
+ /* Reset formats */
+ priv->fmt[V4L2_M2M_SRC] = ipu_mem2mem_vdic_default;
+ priv->fmt[V4L2_M2M_SRC].pixelformat = V4L2_PIX_FMT_YUV420;
+ priv->fmt[V4L2_M2M_SRC].field = V4L2_FIELD_SEQ_TB;
+ priv->fmt[V4L2_M2M_SRC].bytesperline = DEFAULT_WIDTH;
+ priv->fmt[V4L2_M2M_SRC].sizeimage = DEFAULT_WIDTH * DEFAULT_HEIGHT * 3 / 2;
+
+ priv->fmt[V4L2_M2M_DST] = ipu_mem2mem_vdic_default;
+ priv->fmt[V4L2_M2M_DST].pixelformat = V4L2_PIX_FMT_RGB565;
+ priv->fmt[V4L2_M2M_DST].field = V4L2_FIELD_NONE;
+ priv->fmt[V4L2_M2M_DST].bytesperline = DEFAULT_WIDTH * 2;
+ priv->fmt[V4L2_M2M_DST].sizeimage = DEFAULT_WIDTH * DEFAULT_HEIGHT * 2;
+
+ return &priv->vdev;
+
+err_m2m:
+ video_set_drvdata(vfd, NULL);
+err_vfd:
+ kfree(priv);
+ return ERR_PTR(ret);
+}
+
+MODULE_DESCRIPTION("i.MX VDIC mem2mem de-interlace driver");
+MODULE_AUTHOR("Marek Vasut <marex@denx.de>");
+MODULE_LICENSE("GPL");
@@ -162,6 +162,9 @@ struct imx_media_dev {
/* IC scaler/CSC mem2mem video device */
struct imx_media_video_dev *m2m_vdev;
+ /* VDIC mem2mem video device */
+ struct imx_media_video_dev *m2m_vdic[2];
+
/* the IPU internal subdev's registered synchronously */
struct v4l2_subdev *sync_sd[2][NUM_IPU_SUBDEVS];
};
@@ -284,6 +287,12 @@ imx_media_csc_scaler_device_init(struct imx_media_dev *dev);
int imx_media_csc_scaler_device_register(struct imx_media_video_dev *vdev);
void imx_media_csc_scaler_device_unregister(struct imx_media_video_dev *vdev);
+/* imx-media-mem2mem-vdic.c */
+struct imx_media_video_dev *
+imx_media_mem2mem_vdic_init(struct imx_media_dev *dev, int ipu_id);
+int imx_media_mem2mem_vdic_register(struct imx_media_video_dev *vdev);
+void imx_media_mem2mem_vdic_unregister(struct imx_media_video_dev *vdev);
+
/* subdev group ids */
#define IMX_MEDIA_GRP_ID_CSI2 BIT(8)
#define IMX_MEDIA_GRP_ID_IPU_CSI_BIT 10
Introduce dedicated memory-to-memory IPUv3 VDI deinterlacer driver. Currently the IPUv3 can operate VDI in DIRECT mode, from sensor to memory. This only works for single stream, that is, one input from one camera is deinterlaced on the fly with a helper buffer in DRAM and the result is written into memory. The i.MX6Q/QP does support up to four analog cameras via two IPUv3 instances, each containing one VDI deinterlacer block. In order to deinterlace all four streams from all four analog cameras live, it is necessary to operate VDI in INDIRECT mode, where the interlaced streams are written to buffers in memory, and then deinterlaced in memory using VDI in INDIRECT memory-to-memory mode. This driver also makes use of the IDMAC->VDI->IC->IDMAC data path to provide pixel format conversion from input YUV formats to both output YUV or RGB formats. The later is useful in case the data are imported into the GPU, which on this platform cannot directly sample YUV buffers. This is derived from previous work by Steve Longerbeam and from the IPUv3 CSC Scaler mem2mem driver. Signed-off-by: Marek Vasut <marex@denx.de> --- Cc: Daniel Vetter <daniel@ffwll.ch> Cc: David Airlie <airlied@gmail.com> Cc: Fabio Estevam <festevam@gmail.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Helge Deller <deller@gmx.de> Cc: Mauro Carvalho Chehab <mchehab@kernel.org> Cc: Pengutronix Kernel Team <kernel@pengutronix.de> Cc: Philipp Zabel <p.zabel@pengutronix.de> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Shawn Guo <shawnguo@kernel.org> Cc: Steve Longerbeam <slongerbeam@gmail.com> Cc: dri-devel@lists.freedesktop.org Cc: imx@lists.linux.dev Cc: linux-arm-kernel@lists.infradead.org Cc: linux-fbdev@vger.kernel.org Cc: linux-media@vger.kernel.org Cc: linux-staging@lists.linux.dev --- drivers/staging/media/imx/Makefile | 2 +- drivers/staging/media/imx/imx-media-dev.c | 50 + .../media/imx/imx-media-mem2mem-vdic.c | 992 ++++++++++++++++++ drivers/staging/media/imx/imx-media.h | 9 + 4 files changed, 1052 insertions(+), 1 deletion(-) create mode 100644 drivers/staging/media/imx/imx-media-mem2mem-vdic.c