From: Dikshita Agarwal <quic_dikshita@quicinc.com>
To: Vikash Garodia <quic_vgarodia@quicinc.com>,
Abhinav Kumar <quic_abhinavk@quicinc.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
"Rob Herring" <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
"Conor Dooley" <conor+dt@kernel.org>,
Philipp Zabel <p.zabel@pengutronix.de>
Cc: Hans Verkuil <hverkuil@xs4all.nl>,
Sebastian Fricke <sebastian.fricke@collabora.com>,
<linux-arm-msm@vger.kernel.org>, <linux-media@vger.kernel.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Dikshita Agarwal <quic_dikshita@quicinc.com>,
Vedang Nagar <quic_vnagar@quicinc.com>
Subject: [PATCH v4 10/28] media: iris: implement s_fmt, g_fmt and try_fmt ioctls
Date: Mon, 14 Oct 2024 14:37:31 +0530 [thread overview]
Message-ID: <20241014-qcom-video-iris-v4-v4-10-c5eaa4e9ab9e@quicinc.com> (raw)
In-Reply-To: <20241014-qcom-video-iris-v4-v4-0-c5eaa4e9ab9e@quicinc.com>
From: Vedang Nagar <quic_vnagar@quicinc.com>
Implement s_fmt, g_fmt and try_fmt ioctl ops with
necessary hooks.
Signed-off-by: Vedang Nagar <quic_vnagar@quicinc.com>
Signed-off-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
---
drivers/media/platform/qcom/iris/iris_vdec.c | 131 +++++++++++++++++++++++++++
drivers/media/platform/qcom/iris/iris_vdec.h | 2 +
drivers/media/platform/qcom/iris/iris_vidc.c | 48 ++++++++++
3 files changed, 181 insertions(+)
diff --git a/drivers/media/platform/qcom/iris/iris_vdec.c b/drivers/media/platform/qcom/iris/iris_vdec.c
index 7d1ef31c7c44..e807decdda2b 100644
--- a/drivers/media/platform/qcom/iris/iris_vdec.c
+++ b/drivers/media/platform/qcom/iris/iris_vdec.c
@@ -3,6 +3,8 @@
* Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
+#include <media/v4l2-mem2mem.h>
+
#include "iris_buffer.h"
#include "iris_instance.h"
#include "iris_vdec.h"
@@ -10,6 +12,7 @@
#define DEFAULT_WIDTH 320
#define DEFAULT_HEIGHT 240
+#define DEFAULT_CODEC_ALIGNMENT 16
void iris_vdec_inst_init(struct iris_inst *inst)
{
@@ -56,3 +59,131 @@ void iris_vdec_inst_deinit(struct iris_inst *inst)
kfree(inst->fmt_dst);
kfree(inst->fmt_src);
}
+
+int iris_vdec_try_fmt(struct iris_inst *inst, struct v4l2_format *f)
+{
+ struct v4l2_pix_format_mplane *pixmp = &f->fmt.pix_mp;
+ struct v4l2_m2m_ctx *m2m_ctx = inst->m2m_ctx;
+ struct v4l2_format *f_inst;
+ struct vb2_queue *src_q;
+
+ memset(pixmp->reserved, 0, sizeof(pixmp->reserved));
+ switch (f->type) {
+ case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
+ if (f->fmt.pix_mp.pixelformat != V4L2_PIX_FMT_H264) {
+ f_inst = inst->fmt_src;
+ f->fmt.pix_mp.width = f_inst->fmt.pix_mp.width;
+ f->fmt.pix_mp.height = f_inst->fmt.pix_mp.height;
+ f->fmt.pix_mp.pixelformat = f_inst->fmt.pix_mp.pixelformat;
+ }
+ break;
+ case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
+ if (f->fmt.pix_mp.pixelformat != V4L2_PIX_FMT_NV12) {
+ f_inst = inst->fmt_dst;
+ f->fmt.pix_mp.pixelformat = f_inst->fmt.pix_mp.pixelformat;
+ f->fmt.pix_mp.width = f_inst->fmt.pix_mp.width;
+ f->fmt.pix_mp.height = f_inst->fmt.pix_mp.height;
+ }
+
+ src_q = v4l2_m2m_get_src_vq(m2m_ctx);
+ if (vb2_is_streaming(src_q)) {
+ f_inst = inst->fmt_src;
+ f->fmt.pix_mp.height = f_inst->fmt.pix_mp.height;
+ f->fmt.pix_mp.width = f_inst->fmt.pix_mp.width;
+ }
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ if (pixmp->field == V4L2_FIELD_ANY)
+ pixmp->field = V4L2_FIELD_NONE;
+
+ pixmp->num_planes = 1;
+
+ return 0;
+}
+
+int iris_vdec_s_fmt(struct iris_inst *inst, struct v4l2_format *f)
+{
+ struct v4l2_format *fmt, *output_fmt;
+ struct vb2_queue *q;
+ u32 codec_align;
+
+ iris_vdec_try_fmt(inst, f);
+
+ switch (f->type) {
+ case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
+ if (f->fmt.pix_mp.pixelformat != V4L2_PIX_FMT_H264)
+ return -EINVAL;
+
+ fmt = inst->fmt_src;
+ fmt->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
+
+ codec_align = DEFAULT_CODEC_ALIGNMENT;
+ fmt->fmt.pix_mp.width = ALIGN(f->fmt.pix_mp.width, codec_align);
+ fmt->fmt.pix_mp.height = ALIGN(f->fmt.pix_mp.height, codec_align);
+ fmt->fmt.pix_mp.num_planes = 1;
+ fmt->fmt.pix_mp.plane_fmt[0].bytesperline = 0;
+ fmt->fmt.pix_mp.plane_fmt[0].sizeimage = iris_get_buffer_size(inst, BUF_INPUT);
+ inst->buffers[BUF_INPUT].min_count = iris_vpu_buf_count(inst, BUF_INPUT);
+ if (inst->buffers[BUF_INPUT].actual_count < inst->buffers[BUF_INPUT].min_count)
+ inst->buffers[BUF_INPUT].actual_count = inst->buffers[BUF_INPUT].min_count;
+
+ inst->buffers[BUF_INPUT].size = fmt->fmt.pix_mp.plane_fmt[0].sizeimage;
+
+ fmt->fmt.pix_mp.colorspace = f->fmt.pix_mp.colorspace;
+ fmt->fmt.pix_mp.xfer_func = f->fmt.pix_mp.xfer_func;
+ fmt->fmt.pix_mp.ycbcr_enc = f->fmt.pix_mp.ycbcr_enc;
+ fmt->fmt.pix_mp.quantization = f->fmt.pix_mp.quantization;
+
+ output_fmt = inst->fmt_dst;
+ output_fmt->fmt.pix_mp.colorspace = f->fmt.pix_mp.colorspace;
+ output_fmt->fmt.pix_mp.xfer_func = f->fmt.pix_mp.xfer_func;
+ output_fmt->fmt.pix_mp.ycbcr_enc = f->fmt.pix_mp.ycbcr_enc;
+ output_fmt->fmt.pix_mp.quantization = f->fmt.pix_mp.quantization;
+
+ inst->crop.left = 0;
+ inst->crop.top = 0;
+ inst->crop.width = f->fmt.pix_mp.width;
+ inst->crop.height = f->fmt.pix_mp.height;
+ break;
+ case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
+ fmt = inst->fmt_dst;
+ fmt->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
+ q = v4l2_m2m_get_vq(inst->m2m_ctx, f->type);
+ if (q->streaming) {
+ f->fmt.pix_mp.height = inst->fmt_src->fmt.pix_mp.height;
+ f->fmt.pix_mp.width = inst->fmt_src->fmt.pix_mp.width;
+ }
+ if (fmt->fmt.pix_mp.pixelformat != V4L2_PIX_FMT_NV12)
+ return -EINVAL;
+ fmt->fmt.pix_mp.pixelformat = f->fmt.pix_mp.pixelformat;
+ fmt->fmt.pix_mp.width = ALIGN(f->fmt.pix_mp.width, 128);
+ fmt->fmt.pix_mp.height = ALIGN(f->fmt.pix_mp.height, 32);
+ fmt->fmt.pix_mp.num_planes = 1;
+ fmt->fmt.pix_mp.plane_fmt[0].bytesperline = ALIGN(f->fmt.pix_mp.width, 128);
+ fmt->fmt.pix_mp.plane_fmt[0].sizeimage = iris_get_buffer_size(inst, BUF_OUTPUT);
+
+ if (!q->streaming)
+ inst->buffers[BUF_OUTPUT].min_count = iris_vpu_buf_count(inst, BUF_INPUT);
+ if (inst->buffers[BUF_OUTPUT].actual_count < inst->buffers[BUF_OUTPUT].min_count)
+ inst->buffers[BUF_OUTPUT].actual_count =
+ inst->buffers[BUF_OUTPUT].min_count;
+
+ inst->buffers[BUF_OUTPUT].size = fmt->fmt.pix_mp.plane_fmt[0].sizeimage;
+
+ if (!q->streaming) {
+ inst->crop.top = 0;
+ inst->crop.left = 0;
+ inst->crop.width = f->fmt.pix_mp.width;
+ inst->crop.height = f->fmt.pix_mp.height;
+ }
+ break;
+ default:
+ return -EINVAL;
+ }
+ memcpy(f, fmt, sizeof(*fmt));
+
+ return 0;
+}
diff --git a/drivers/media/platform/qcom/iris/iris_vdec.h b/drivers/media/platform/qcom/iris/iris_vdec.h
index 0324d7f796dd..4f2557d15ca2 100644
--- a/drivers/media/platform/qcom/iris/iris_vdec.h
+++ b/drivers/media/platform/qcom/iris/iris_vdec.h
@@ -10,5 +10,7 @@ struct iris_inst;
void iris_vdec_inst_init(struct iris_inst *inst);
void iris_vdec_inst_deinit(struct iris_inst *inst);
+int iris_vdec_try_fmt(struct iris_inst *inst, struct v4l2_format *f);
+int iris_vdec_s_fmt(struct iris_inst *inst, struct v4l2_format *f);
#endif
diff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/platform/qcom/iris/iris_vidc.c
index b1a9f0b5380d..05146970189b 100644
--- a/drivers/media/platform/qcom/iris/iris_vidc.c
+++ b/drivers/media/platform/qcom/iris/iris_vidc.c
@@ -214,6 +214,48 @@ int iris_close(struct file *filp)
return 0;
}
+static int iris_try_fmt_vid_mplane(struct file *filp, void *fh, struct v4l2_format *f)
+{
+ struct iris_inst *inst = iris_get_inst(filp, NULL);
+ int ret;
+
+ mutex_lock(&inst->lock);
+ ret = iris_vdec_try_fmt(inst, f);
+ mutex_unlock(&inst->lock);
+
+ return ret;
+}
+
+static int iris_s_fmt_vid_mplane(struct file *filp, void *fh, struct v4l2_format *f)
+{
+ struct iris_inst *inst = iris_get_inst(filp, NULL);
+ int ret;
+
+ mutex_lock(&inst->lock);
+ ret = iris_vdec_s_fmt(inst, f);
+ mutex_unlock(&inst->lock);
+
+ return ret;
+}
+
+static int iris_g_fmt_vid_mplane(struct file *filp, void *fh, struct v4l2_format *f)
+{
+ struct iris_inst *inst = iris_get_inst(filp, NULL);
+ int ret = 0;
+
+ mutex_lock(&inst->lock);
+ if (V4L2_TYPE_IS_OUTPUT(f->type))
+ memcpy(f, inst->fmt_src, sizeof(*f));
+ else if (V4L2_TYPE_IS_CAPTURE(f->type))
+ memcpy(f, inst->fmt_dst, sizeof(*f));
+ else
+ ret = -EINVAL;
+
+ mutex_unlock(&inst->lock);
+
+ return ret;
+}
+
static struct v4l2_file_operations iris_v4l2_file_ops = {
.owner = THIS_MODULE,
.open = iris_open,
@@ -228,6 +270,12 @@ static const struct vb2_ops iris_vb2_ops = {
};
static const struct v4l2_ioctl_ops iris_v4l2_ioctl_ops = {
+ .vidioc_try_fmt_vid_cap_mplane = iris_try_fmt_vid_mplane,
+ .vidioc_try_fmt_vid_out_mplane = iris_try_fmt_vid_mplane,
+ .vidioc_s_fmt_vid_cap_mplane = iris_s_fmt_vid_mplane,
+ .vidioc_s_fmt_vid_out_mplane = iris_s_fmt_vid_mplane,
+ .vidioc_g_fmt_vid_cap_mplane = iris_g_fmt_vid_mplane,
+ .vidioc_g_fmt_vid_out_mplane = iris_g_fmt_vid_mplane,
.vidioc_reqbufs = v4l2_m2m_ioctl_reqbufs,
};
--
2.34.1
next prev parent reply other threads:[~2024-10-14 9:08 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-14 9:07 [PATCH v4 00/28] Qualcomm iris video decoder driver Dikshita Agarwal
2024-10-14 9:07 ` [PATCH v4 01/28] dt-bindings: media: Add video support for QCOM SM8550 SoC Dikshita Agarwal
2024-10-14 11:57 ` Krzysztof Kozlowski
2024-10-14 9:07 ` [PATCH v4 02/28] media: iris: add platform driver for iris video device Dikshita Agarwal
2024-10-16 9:38 ` Uwe Kleine-König
2024-10-16 10:29 ` Dikshita Agarwal
2024-10-14 9:07 ` [PATCH v4 03/28] media: iris: implement iris v4l2 file ops Dikshita Agarwal
2024-10-14 9:07 ` [PATCH v4 04/28] media: iris: introduce iris core state management with shared queues Dikshita Agarwal
2024-10-14 9:07 ` [PATCH v4 05/28] media: iris: implement video firmware load/unload Dikshita Agarwal
2024-10-14 9:07 ` [PATCH v4 06/28] media: iris: implement boot sequence of the firmware Dikshita Agarwal
2024-10-14 9:07 ` [PATCH v4 07/28] media: iris: introduce host firmware interface with necessary hooks Dikshita Agarwal
2024-10-14 9:07 ` [PATCH v4 08/28] media: iris: implement power management Dikshita Agarwal
2024-10-15 11:25 ` kernel test robot
2024-10-15 12:07 ` kernel test robot
2024-10-14 9:07 ` [PATCH v4 09/28] media: iris: implement reqbuf ioctl with vb2_queue_setup Dikshita Agarwal
2024-10-23 9:59 ` Hans Verkuil
2024-10-23 10:17 ` Dikshita Agarwal
2024-10-23 11:25 ` Hans Verkuil
2024-10-23 11:33 ` Dikshita Agarwal
2024-10-14 9:07 ` Dikshita Agarwal [this message]
2024-10-14 9:07 ` [PATCH v4 11/28] media: iris: implement g_selection ioctl Dikshita Agarwal
2024-10-23 10:45 ` Hans Verkuil
2024-10-23 11:31 ` Dikshita Agarwal
2024-10-14 9:07 ` [PATCH v4 12/28] media: iris: implement enum_fmt and enum_frameintervals ioctls Dikshita Agarwal
2024-10-23 10:49 ` Hans Verkuil
2024-10-23 11:38 ` Dikshita Agarwal
2024-10-14 9:07 ` [PATCH v4 13/28] media: iris: implement subscribe_event and unsubscribe_event ioctls Dikshita Agarwal
2024-10-23 10:53 ` Hans Verkuil
2024-10-23 12:03 ` Dikshita Agarwal
2024-10-14 9:07 ` [PATCH v4 14/28] media: iris: implement iris v4l2_ctrl_ops Dikshita Agarwal
2024-10-23 11:02 ` Hans Verkuil
2024-10-25 9:21 ` Dikshita Agarwal
2024-10-14 9:07 ` [PATCH v4 15/28] media: iris: implement query_cap, query_ctrl and query_menu ioctls Dikshita Agarwal
2024-10-23 11:05 ` Hans Verkuil
2024-10-24 5:50 ` Dikshita Agarwal
2024-10-14 9:07 ` [PATCH v4 16/28] media: iris: implement vb2 streaming ops Dikshita Agarwal
2024-10-23 11:13 ` Hans Verkuil
2024-10-25 7:06 ` Dikshita Agarwal
2024-10-14 9:07 ` [PATCH v4 17/28] media: iris: implement set properties to firmware during streamon Dikshita Agarwal
2024-10-14 9:07 ` [PATCH v4 18/28] media: iris: subscribe parameters and properties to firmware for hfi_gen2 Dikshita Agarwal
2024-10-14 9:07 ` [PATCH v4 19/28] media: iris: allocate, initialize and queue internal buffers Dikshita Agarwal
2024-10-14 9:07 ` [PATCH v4 20/28] media: iris: implement vb2 ops for buf_queue and firmware response Dikshita Agarwal
2024-10-23 11:19 ` Hans Verkuil
2024-10-23 11:53 ` Dikshita Agarwal
2024-10-14 9:07 ` [PATCH v4 21/28] media: iris: add support for dynamic resolution change Dikshita Agarwal
2024-10-14 9:07 ` [PATCH v4 22/28] media: iris: handle streamoff/on from client in " Dikshita Agarwal
2024-10-14 9:07 ` [PATCH v4 23/28] media: iris: add support for drain sequence Dikshita Agarwal
2024-10-14 9:07 ` [PATCH v4 24/28] media: iris: add check whether the video session is supported or not Dikshita Agarwal
2024-10-14 9:07 ` [PATCH v4 25/28] media: iris: implement power scaling for vpu2 and vpu3 Dikshita Agarwal
2024-10-17 6:08 ` kernel test robot
2024-10-19 11:38 ` kernel test robot
2024-10-14 9:07 ` [PATCH v4 26/28] media: iris: add check to allow sub states transitions Dikshita Agarwal
2024-10-14 9:07 ` [PATCH v4 27/28] media: iris: enable video driver probe of SM8250 SoC Dikshita Agarwal
2024-10-14 14:00 ` Jianhua Lu
2024-10-14 14:08 ` Dmitry Baryshkov
2024-10-15 9:22 ` Dikshita Agarwal
2024-10-15 12:26 ` Dmitry Baryshkov
2024-10-25 7:03 ` Dikshita Agarwal
2024-10-14 9:07 ` [PATCH v4 28/28] media: MAINTAINERS: add Qualcomm iris video accelerator driver Dikshita Agarwal
2024-10-14 11:54 ` [PATCH v4 00/28] Qualcomm iris video decoder driver Krzysztof Kozlowski
2024-10-15 7:26 ` Dikshita Agarwal
2024-10-17 1:26 ` Bryan O'Donoghue
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241014-qcom-video-iris-v4-v4-10-c5eaa4e9ab9e@quicinc.com \
--to=quic_dikshita@quicinc.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=hverkuil@xs4all.nl \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=quic_abhinavk@quicinc.com \
--cc=quic_vgarodia@quicinc.com \
--cc=quic_vnagar@quicinc.com \
--cc=robh@kernel.org \
--cc=sebastian.fricke@collabora.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).