From patchwork Fri Jun 2 16:02:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Escande X-Patchwork-Id: 9762901 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 021DA6038E for ; Fri, 2 Jun 2017 16:04:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E6DD728380 for ; Fri, 2 Jun 2017 16:04:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DAF6828179; Fri, 2 Jun 2017 16:04:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 376FA27F60 for ; Fri, 2 Jun 2017 16:04:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751339AbdFBQDt (ORCPT ); Fri, 2 Jun 2017 12:03:49 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:57971 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751283AbdFBQDS (ORCPT ); Fri, 2 Jun 2017 12:03:18 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: tescande) with ESMTPSA id 7344F26B861 From: Thierry Escande To: Andrzej Pietrasiewicz , Jacek Anaszewski , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 9/9] [media] s5p-jpeg: Add support for multi-planar APIs Date: Fri, 2 Jun 2017 18:02:56 +0200 Message-Id: <1496419376-17099-10-git-send-email-thierry.escande@collabora.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496419376-17099-1-git-send-email-thierry.escande@collabora.com> References: <1496419376-17099-1-git-send-email-thierry.escande@collabora.com> MIME-Version: 1.0 Content-Transfert-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ricky Liang This patch adds multi-planar APIs to the s5p-jpeg driver. The multi-planar APIs are identical to the exisiting single-planar APIs except the plane format info is stored in the v4l2_pixel_format_mplan struct instead of the v4l2_pixel_format struct. Signed-off-by: Ricky Liang Signed-off-by: Thierry Escande --- drivers/media/platform/s5p-jpeg/jpeg-core.c | 152 +++++++++++++++++++++++++--- drivers/media/platform/s5p-jpeg/jpeg-core.h | 2 + 2 files changed, 139 insertions(+), 15 deletions(-) diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c index db56135..a8fd7ed 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c @@ -1371,6 +1371,15 @@ static int s5p_jpeg_querycap(struct file *file, void *priv, dev_name(ctx->jpeg->dev)); cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_M2M; cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; + /* + * Advertise multi-planar capabilities. The driver supports only + * single-planar pixel format at this moment so all the buffers will + * have only one plane. + */ + cap->capabilities |= V4L2_CAP_VIDEO_M2M_MPLANE | + V4L2_CAP_VIDEO_CAPTURE_MPLANE | + V4L2_CAP_VIDEO_OUTPUT_MPLANE; + return 0; } @@ -1430,12 +1439,10 @@ static int s5p_jpeg_enum_fmt_vid_out(struct file *file, void *priv, static struct s5p_jpeg_q_data *get_q_data(struct s5p_jpeg_ctx *ctx, enum v4l2_buf_type type) { - if (type == V4L2_BUF_TYPE_VIDEO_OUTPUT) + if (V4L2_TYPE_IS_OUTPUT(type)) return &ctx->out_q; - if (type == V4L2_BUF_TYPE_VIDEO_CAPTURE) - return &ctx->cap_q; - return NULL; + return &ctx->cap_q; } static int s5p_jpeg_g_fmt(struct file *file, void *priv, struct v4l2_format *f) @@ -1449,16 +1456,14 @@ static int s5p_jpeg_g_fmt(struct file *file, void *priv, struct v4l2_format *f) if (!vq) return -EINVAL; - if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && + if (!V4L2_TYPE_IS_OUTPUT(f->type) && ct->mode == S5P_JPEG_DECODE && !ct->hdr_parsed) return -EINVAL; q_data = get_q_data(ct, f->type); BUG_ON(q_data == NULL); - if ((f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && - ct->mode == S5P_JPEG_ENCODE) || - (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT && - ct->mode == S5P_JPEG_DECODE)) { + if ((!V4L2_TYPE_IS_OUTPUT(f->type) && ct->mode == S5P_JPEG_ENCODE) || + (V4L2_TYPE_IS_OUTPUT(f->type) && ct->mode == S5P_JPEG_DECODE)) { pix->width = 0; pix->height = 0; } else { @@ -1715,6 +1720,8 @@ static int s5p_jpeg_s_fmt(struct s5p_jpeg_ctx *ct, struct v4l2_format *f) q_data = get_q_data(ct, f->type); BUG_ON(q_data == NULL); + vq->type = f->type; + q_data->type = f->type; if (vb2_is_busy(vq)) { v4l2_err(&ct->jpeg->v4l2_dev, "%s queue busy\n", __func__); @@ -1919,7 +1926,9 @@ static int s5p_jpeg_g_selection(struct file *file, void *priv, struct s5p_jpeg_ctx *ctx = fh_to_ctx(priv); if (s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT && - s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) + s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE && + s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE && + s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) return -EINVAL; /* For JPEG blob active == default == bounds */ @@ -1957,7 +1966,8 @@ static int s5p_jpeg_s_selection(struct file *file, void *fh, struct v4l2_rect *rect = &s->r; int ret = -EINVAL; - if (s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) + if (s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE && + s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) return -EINVAL; if (s->target == V4L2_SEL_TGT_COMPOSE) { @@ -2118,6 +2128,107 @@ static int s5p_jpeg_controls_create(struct s5p_jpeg_ctx *ctx) return ret; } +static void v4l2_format_pixmp_to_pix(struct v4l2_format *fmt_pix_mp, + struct v4l2_format *fmt_pix) { + struct v4l2_pix_format *pix = &fmt_pix->fmt.pix; + struct v4l2_pix_format_mplane *pix_mp = &fmt_pix_mp->fmt.pix_mp; + + fmt_pix->type = fmt_pix_mp->type; + pix->width = pix_mp->width; + pix->height = pix_mp->height; + pix->pixelformat = pix_mp->pixelformat; + pix->field = pix_mp->field; + pix->colorspace = pix_mp->colorspace; + pix->bytesperline = pix_mp->plane_fmt[0].bytesperline; + pix->sizeimage = pix_mp->plane_fmt[0].sizeimage; +} + +static void v4l2_format_pixmp_from_pix(struct v4l2_format *fmt_pix_mp, + struct v4l2_format *fmt_pix) { + struct v4l2_pix_format *pix = &fmt_pix->fmt.pix; + struct v4l2_pix_format_mplane *pix_mp = &fmt_pix_mp->fmt.pix_mp; + + fmt_pix_mp->type = fmt_pix->type; + pix_mp->width = pix->width; + pix_mp->height = pix->height; + pix_mp->pixelformat = pix->pixelformat; + pix_mp->field = pix->field; + pix_mp->colorspace = pix->colorspace; + pix_mp->plane_fmt[0].bytesperline = pix->bytesperline; + pix_mp->plane_fmt[0].sizeimage = pix->sizeimage; + pix_mp->num_planes = 1; +} + +static int s5p_jpeg_g_fmt_mplane(struct file *file, void *priv, + struct v4l2_format *f) +{ + struct v4l2_format tmp; + int ret; + + memset(&tmp, 0, sizeof(tmp)); + v4l2_format_pixmp_to_pix(f, &tmp); + ret = s5p_jpeg_g_fmt(file, priv, &tmp); + v4l2_format_pixmp_from_pix(f, &tmp); + + return ret; +} + +static int s5p_jpeg_try_fmt_vid_cap_mplane(struct file *file, void *priv, + struct v4l2_format *f) +{ + struct v4l2_format tmp; + int ret; + + memset(&tmp, 0, sizeof(tmp)); + v4l2_format_pixmp_to_pix(f, &tmp); + ret = s5p_jpeg_try_fmt_vid_cap(file, priv, &tmp); + v4l2_format_pixmp_from_pix(f, &tmp); + + return ret; +} + +static int s5p_jpeg_try_fmt_vid_out_mplane(struct file *file, void *priv, + struct v4l2_format *f) +{ + struct v4l2_format tmp; + int ret; + + memset(&tmp, 0, sizeof(tmp)); + v4l2_format_pixmp_to_pix(f, &tmp); + ret = s5p_jpeg_try_fmt_vid_out(file, priv, &tmp); + v4l2_format_pixmp_from_pix(f, &tmp); + + return ret; +} + +static int s5p_jpeg_s_fmt_vid_cap_mplane(struct file *file, void *priv, + struct v4l2_format *f) +{ + struct v4l2_format tmp; + int ret; + + memset(&tmp, 0, sizeof(tmp)); + v4l2_format_pixmp_to_pix(f, &tmp); + ret = s5p_jpeg_s_fmt_vid_cap(file, priv, &tmp); + v4l2_format_pixmp_from_pix(f, &tmp); + + return ret; +} + +static int s5p_jpeg_s_fmt_vid_out_mplane(struct file *file, void *priv, + struct v4l2_format *f) +{ + struct v4l2_format tmp; + int ret; + + memset(&tmp, 0, sizeof(tmp)); + v4l2_format_pixmp_to_pix(f, &tmp); + ret = s5p_jpeg_s_fmt_vid_out(file, priv, &tmp); + v4l2_format_pixmp_from_pix(f, &tmp); + + return ret; +} + static const struct v4l2_ioctl_ops s5p_jpeg_ioctl_ops = { .vidioc_querycap = s5p_jpeg_querycap, @@ -2133,6 +2244,18 @@ static const struct v4l2_ioctl_ops s5p_jpeg_ioctl_ops = { .vidioc_s_fmt_vid_cap = s5p_jpeg_s_fmt_vid_cap, .vidioc_s_fmt_vid_out = s5p_jpeg_s_fmt_vid_out, + .vidioc_enum_fmt_vid_cap_mplane = s5p_jpeg_enum_fmt_vid_cap, + .vidioc_enum_fmt_vid_out_mplane = s5p_jpeg_enum_fmt_vid_out, + + .vidioc_g_fmt_vid_cap_mplane = s5p_jpeg_g_fmt_mplane, + .vidioc_g_fmt_vid_out_mplane = s5p_jpeg_g_fmt_mplane, + + .vidioc_try_fmt_vid_cap_mplane = s5p_jpeg_try_fmt_vid_cap_mplane, + .vidioc_try_fmt_vid_out_mplane = s5p_jpeg_try_fmt_vid_out_mplane, + + .vidioc_s_fmt_vid_cap_mplane = s5p_jpeg_s_fmt_vid_cap_mplane, + .vidioc_s_fmt_vid_out_mplane = s5p_jpeg_s_fmt_vid_out_mplane, + .vidioc_reqbufs = v4l2_m2m_ioctl_reqbufs, .vidioc_querybuf = v4l2_m2m_ioctl_querybuf, .vidioc_qbuf = v4l2_m2m_ioctl_qbuf, @@ -2648,7 +2771,7 @@ static void s5p_jpeg_buf_queue(struct vb2_buffer *vb) struct s5p_jpeg_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); if (ctx->mode == S5P_JPEG_DECODE && - vb->vb2_queue->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) { + vb->vb2_queue->type == ctx->out_q.type) { static const struct v4l2_event ev_src_ch = { .type = V4L2_EVENT_SOURCE_CHANGE, .u.src_change.changes = V4L2_EVENT_SRC_CH_RESOLUTION, @@ -2657,8 +2780,7 @@ static void s5p_jpeg_buf_queue(struct vb2_buffer *vb) u32 ori_w; u32 ori_h; - dst_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, - V4L2_BUF_TYPE_VIDEO_CAPTURE); + dst_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, ctx->cap_q.type); ori_w = ctx->out_q.w; ori_h = ctx->out_q.h; @@ -2708,7 +2830,7 @@ static void s5p_jpeg_stop_streaming(struct vb2_queue *q) * subsampling. Update capture queue when the stream is off. */ if (ctx->state == JPEGCTX_RESOLUTION_CHANGE && - q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) { + !V4L2_TYPE_IS_OUTPUT(q->type)) { s5p_jpeg_set_capture_queue_data(ctx); ctx->state = JPEGCTX_RUNNING; } diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.h b/drivers/media/platform/s5p-jpeg/jpeg-core.h index 9aa26bd..302a297 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.h +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.h @@ -196,6 +196,7 @@ struct s5p_jpeg_marker { * @sof_len: SOF0 marker's payload length (without length field itself) * @components: number of image components * @size: image buffer size in bytes + * @type: buffer type of the queue (enum v4l2_buf_type) */ struct s5p_jpeg_q_data { struct s5p_jpeg_fmt *fmt; @@ -208,6 +209,7 @@ struct s5p_jpeg_q_data { u32 sof_len; u32 components; u32 size; + u32 type; }; /**