From: Jungo Lin <jungo.lin@mediatek.com>
To: <tfiga@chromium.org>, <hverkuil@xs4all.nl>,
<laurent.pinchart@ideasonboard.com>, <matthias.bgg@gmail.com>,
<mchehab@kernel.org>
Cc: <linux-media@vger.kernel.org>,
<linux-mediatek@lists.infradead.org>,
<linux-arm-kernel@lists.infradead.org>,
<devicetree@vger.kernel.org>, <srv_heupstream@mediatek.com>,
<ddavenport@chromium.org>, <robh@kernel.org>,
<sean.cheng@mediatek.com>, <sj.huang@mediatek.com>,
<frederic.chen@mediatek.com>, <ryan.yu@mediatek.com>,
<rynn.wu@mediatek.com>, <jungo.lin@mediatek.com>,
<frankie.chiu@mediatek.com>
Subject: [RFC,v3 5/9] media: platform: Add Mediatek ISP P1 V4L2 control
Date: Tue, 11 Jun 2019 11:53:40 +0800 [thread overview]
Message-ID: <20190611035344.29814-6-jungo.lin@mediatek.com> (raw)
In-Reply-To: <20190611035344.29814-1-jungo.lin@mediatek.com>
Reserved Mediatek ISP P1 V4L2 control number with 16.
Moreover, add two V4L2 controls for ISP P1 user space
usage.
1. V4L2_CID_MTK_GET_BIN_INFO
- Provide the image output width & height in case
camera binning mode is enabled.
2. V4L2_CID_MTK_RAW_PATH
- Export the path control of the main stream to user space.
One is pure raw and the other is processing raw.
The default value is 0 which outputs the pure raw bayer image
from sesnor, without image processing in ISP HW.
Signed-off-by: Jungo Lin <jungo.lin@mediatek.com>
---
drivers/media/platform/mtk-isp/Makefile | 3 +
.../media/platform/mtk-isp/isp_50/Makefile | 5 +
.../platform/mtk-isp/isp_50/cam/Makefile | 5 +
.../mtk-isp/isp_50/cam/mtk_cam-ctrl.c | 138 ++++++++++++++++++
.../mtk-isp/isp_50/cam/mtk_cam-ctrl.h | 38 +++++
include/uapi/linux/v4l2-controls.h | 4 +
6 files changed, 193 insertions(+)
create mode 100644 drivers/media/platform/mtk-isp/Makefile
create mode 100644 drivers/media/platform/mtk-isp/isp_50/Makefile
create mode 100644 drivers/media/platform/mtk-isp/isp_50/cam/Makefile
create mode 100644 drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-ctrl.c
create mode 100644 drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-ctrl.h
diff --git a/drivers/media/platform/mtk-isp/Makefile b/drivers/media/platform/mtk-isp/Makefile
new file mode 100644
index 000000000000..c17fb3fc3340
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/Makefile
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-y += isp_50/
diff --git a/drivers/media/platform/mtk-isp/isp_50/Makefile b/drivers/media/platform/mtk-isp/isp_50/Makefile
new file mode 100644
index 000000000000..8498fe70e418
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+ifeq ($(CONFIG_VIDEO_MEDIATEK_ISP_PASS1),y)
+obj-y += cam/
+endif
diff --git a/drivers/media/platform/mtk-isp/isp_50/cam/Makefile b/drivers/media/platform/mtk-isp/isp_50/cam/Makefile
new file mode 100644
index 000000000000..53fb69d3add6
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/cam/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
+mtk-cam-isp-objs += mtk_cam-ctrl.o
+
+obj-$(CONFIG_VIDEO_MEDIATEK_ISP_PASS1) += mtk-cam-isp.o
\ No newline at end of file
diff --git a/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-ctrl.c b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-ctrl.c
new file mode 100644
index 000000000000..31d801c82495
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-ctrl.c
@@ -0,0 +1,138 @@
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (c) 2018 MediaTek Inc.
+
+#include <linux/device.h>
+#include <linux/platform_device.h>
+
+#include "mtk_cam-ctrl.h"
+#include "mtk_cam.h"
+
+static int handle_ctrl_get_bin_info(struct v4l2_ctrl *ctrl, int is_width)
+{
+ struct mtk_cam_dev *cam_dev = ctrl->priv;
+ struct v4l2_format *fmt;
+
+ fmt = &cam_dev->vdev_nodes[MTK_CAM_P1_MAIN_STREAM_OUT].vdev_fmt;
+
+ dev_dbg(&cam_dev->pdev->dev, "Get bin info w*h:%d*%d is_width:%d",
+ fmt->fmt.pix_mp.width, fmt->fmt.pix_mp.height, is_width);
+
+ if (is_width)
+ ctrl->val = fmt->fmt.pix_mp.width;
+ else
+ ctrl->val = fmt->fmt.pix_mp.height;
+
+ return 0;
+}
+
+static int handle_ctrl_get_process_raw(struct v4l2_ctrl *ctrl)
+{
+ struct mtk_cam_dev *cam_dev = ctrl->priv;
+ struct isp_p1_device *p1_dev = get_p1_device(&cam_dev->pdev->dev);
+
+ ctrl->val = (p1_dev->isp_ctx.isp_raw_path == ISP_PROCESS_RAW_PATH);
+
+ dev_dbg(&cam_dev->pdev->dev, "Get process raw:%d", ctrl->val);
+
+ return 0;
+}
+
+static int handle_ctrl_set_process_raw(struct v4l2_ctrl *ctrl)
+{
+ struct mtk_cam_dev *cam_dev = ctrl->priv;
+ struct isp_p1_device *p1_dev = get_p1_device(&cam_dev->pdev->dev);
+
+ p1_dev->isp_ctx.isp_raw_path = (ctrl->val) ?
+ ISP_PROCESS_RAW_PATH : ISP_PURE_RAW_PATH;
+ dev_dbg(&cam_dev->pdev->dev, "Set process raw:%d", ctrl->val);
+ return 0;
+}
+
+static int mtk_cam_dev_g_ctrl(struct v4l2_ctrl *ctrl)
+{
+ switch (ctrl->id) {
+ case V4L2_CID_MTK_PROCESSING_RAW:
+ handle_ctrl_get_process_raw(ctrl);
+ break;
+ case V4L2_CID_MTK_GET_BIN_WIDTH:
+ handle_ctrl_get_bin_info(ctrl, 1);
+ break;
+ case V4L2_CID_MTK_GET_BIN_HEIGTH:
+ handle_ctrl_get_bin_info(ctrl, 0);
+ break;
+ default:
+ return -EINVAL;
+ }
+ return 0;
+}
+
+static int mtk_cam_dev_s_ctrl(struct v4l2_ctrl *ctrl)
+{
+ switch (ctrl->id) {
+ case V4L2_CID_MTK_PROCESSING_RAW:
+ return handle_ctrl_set_process_raw(ctrl);
+ default:
+ return -EINVAL;
+ }
+}
+
+static const struct v4l2_ctrl_ops mtk_cam_dev_ctrl_ops = {
+ .g_volatile_ctrl = mtk_cam_dev_g_ctrl,
+ .s_ctrl = mtk_cam_dev_s_ctrl,
+};
+
+struct v4l2_ctrl_config mtk_cam_controls[] = {
+ {
+ .ops = &mtk_cam_dev_ctrl_ops,
+ .id = V4L2_CID_MTK_PROCESSING_RAW,
+ .name = "MTK CAM PROCESSING RAW",
+ .type = V4L2_CTRL_TYPE_BOOLEAN,
+ .min = 0,
+ .max = 1,
+ .step = 1,
+ .def = 1,
+ },
+ {
+ .ops = &mtk_cam_dev_ctrl_ops,
+ .id = V4L2_CID_MTK_GET_BIN_WIDTH,
+ .name = "MTK CAM GET BIN WIDTH",
+ .type = V4L2_CTRL_TYPE_INTEGER,
+ .min = IMG_MIN_WIDTH,
+ .max = IMG_MAX_WIDTH,
+ .step = 1,
+ .def = IMG_MAX_WIDTH,
+ .flags = V4L2_CTRL_FLAG_READ_ONLY | V4L2_CTRL_FLAG_VOLATILE,
+ },
+ {
+ .ops = &mtk_cam_dev_ctrl_ops,
+ .id = V4L2_CID_MTK_GET_BIN_HEIGTH,
+ .name = "MTK CAM GET BIN HEIGHT",
+ .type = V4L2_CTRL_TYPE_INTEGER,
+ .min = IMG_MIN_HEIGHT,
+ .max = IMG_MAX_HEIGHT,
+ .step = 1,
+ .def = IMG_MAX_HEIGHT,
+ .flags = V4L2_CTRL_FLAG_READ_ONLY | V4L2_CTRL_FLAG_VOLATILE,
+ },
+};
+
+int mtk_cam_ctrl_init(struct mtk_cam_dev *cam_dev,
+ struct v4l2_ctrl_handler *hdl)
+{
+ unsigned int i;
+
+ /* Initialized HW controls, allow V4L2_CID_MTK_CAM_MAX ctrls */
+ v4l2_ctrl_handler_init(hdl, V4L2_CID_MTK_CAM_MAX);
+ if (hdl->error) {
+ v4l2_ctrl_handler_free(hdl);
+ return hdl->error;
+ }
+
+ for (i = 0; i < ARRAY_SIZE(mtk_cam_controls); i++)
+ v4l2_ctrl_new_custom(hdl, &mtk_cam_controls[i], cam_dev);
+
+ dev_dbg(&cam_dev->pdev->dev, "%s done", __func__);
+
+ return 0;
+}
diff --git a/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-ctrl.h b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-ctrl.h
new file mode 100644
index 000000000000..0f9349ae0b07
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-ctrl.h
@@ -0,0 +1,38 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (c) 2018 MediaTek Inc.
+ */
+
+#ifndef __MTK_CAM_CTRL_H__
+#define __MTK_CAM_CTRL_H__
+
+#include <media/v4l2-ctrls.h>
+
+#include "mtk_cam-v4l2-util.h"
+
+/* The base for the MTK Camera ISP P1 driver controls.
+ * We reserve 16 controls for this driver.
+ */
+#define V4L2_CID_MTK_CAM_BASE V4L2_CID_USER_MTK_CAM_BASE
+
+/* Control MTK ISP P1 main stream to process raw image data or not.
+ * The default value is 0 which outputs the pure raw bayer data from sensor,
+ * without image processing in ISP HW.
+ */
+#define V4L2_CID_MTK_PROCESSING_RAW (V4L2_CID_MTK_CAM_BASE + 1)
+
+/* MTK ISP P1 HW supports frontal binning function.
+ * If this function is enabled, the 3A algo. may get the new image resolution
+ * which is binned by ISP P1. If this function is disabled or no supported,
+ * the image resolution will be equal to configured image format.
+ * For this control, it is read only.
+ */
+#define V4L2_CID_MTK_GET_BIN_WIDTH (V4L2_CID_MTK_CAM_BASE + 2)
+#define V4L2_CID_MTK_GET_BIN_HEIGTH (V4L2_CID_MTK_CAM_BASE + 3)
+
+#define V4L2_CID_MTK_CAM_MAX 16
+
+int mtk_cam_ctrl_init(struct mtk_cam_dev *cam_dev,
+ struct v4l2_ctrl_handler *hdl);
+
+#endif /* __MTK_CAM_CTRL_H__ */
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index 37807f23231e..2db99716f40d 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -192,6 +192,10 @@ enum v4l2_colorfx {
* We reserve 16 controls for this driver. */
#define V4L2_CID_USER_IMX_BASE (V4L2_CID_USER_BASE + 0x10b0)
+/* The base for the mediatek ISP Pass 1 driver controls */
+/* We reserve 16 controls for this driver. */
+#define V4L2_CID_USER_MTK_CAM_BASE (V4L2_CID_USER_BASE + 0x10c0)
+
/* MPEG-class control IDs */
/* The MPEG controls are applicable to all codec controls
* and the 'MPEG' part of the define is historical */
--
2.18.0
next prev parent reply other threads:[~2019-06-11 3:54 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-11 3:53 [RFC,V3 0/9] media: platform: mtk-isp: Add Mediatek ISP Pass 1 driver Jungo Lin
2019-06-11 3:53 ` [RFC,v3 1/9] dt-bindings: mt8183: Added camera ISP Pass 1 Jungo Lin
2019-06-11 3:53 ` [RFC,v3 2/9] dts: arm64: mt8183: Add ISP Pass 1 nodes Jungo Lin
2019-06-11 3:53 ` [RFC,v3 3/9] media: platform: Add Mediatek ISP Pass 1 driver Kconfig Jungo Lin
2019-06-11 3:53 ` [RFC,v3 4/9] media: platform: Add Mediatek ISP P1 image & meta formats Jungo Lin
2019-06-11 3:53 ` Jungo Lin [this message]
2019-07-01 5:50 ` [RFC,v3 5/9] media: platform: Add Mediatek ISP P1 V4L2 control Tomasz Figa
2019-07-02 11:34 ` Jungo Lin
2019-06-11 3:53 ` [RFC,v3 6/9] media: platform: Add Mediatek ISP P1 V4L2 functions Jungo Lin
2019-07-10 9:54 ` Tomasz Figa
2019-07-18 4:39 ` Jungo Lin
2019-07-23 10:21 ` Tomasz Figa
2019-07-24 4:31 ` Jungo Lin
2019-07-26 5:49 ` Tomasz Figa
2019-07-29 1:18 ` Jungo Lin
2019-07-29 10:04 ` Tomasz Figa
2019-07-30 1:44 ` Jungo Lin
2019-08-05 9:59 ` Tomasz Figa
2019-06-11 3:53 ` [RFC,v3 7/9] media: platform: Add Mediatek ISP P1 device driver Jungo Lin
2019-07-10 9:56 ` Tomasz Figa
2019-07-20 9:58 ` Jungo Lin
2019-07-25 9:23 ` Tomasz Figa
2019-07-26 7:23 ` Jungo Lin
2019-08-06 9:47 ` Tomasz Figa
2019-08-07 2:11 ` Jungo Lin
2019-08-07 13:25 ` Tomasz Figa
2019-06-11 3:53 ` [RFC,v3 8/9] media: platform: Add Mediatek ISP P1 SCP communication Jungo Lin
2019-07-10 9:58 ` Tomasz Figa
2019-07-21 2:18 ` Jungo Lin
2019-07-25 10:56 ` Tomasz Figa
2019-07-26 8:07 ` Jungo Lin
2019-06-11 3:53 ` [RFC,v3 9/9] media: platform: Add Mediatek ISP P1 shared memory device Jungo Lin
2019-07-01 7:25 ` Tomasz Figa
2019-07-05 3:33 ` Jungo Lin
2019-07-05 4:22 ` Tomasz Figa
2019-07-05 5:44 ` Jungo Lin
2019-07-05 7:59 ` Jungo Lin
2019-07-23 7:20 ` Tomasz Figa
2019-07-23 8:21 ` [RFC, v3 " Jungo Lin
2019-07-26 5:15 ` Tomasz Figa
2019-07-26 7:41 ` Christoph Hellwig
2019-07-26 7:42 ` Tomasz Figa
2019-07-26 11:04 ` Robin Murphy
2019-07-26 11:59 ` Jungo Lin
2019-07-26 14:04 ` Tomasz Figa
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=20190611035344.29814-6-jungo.lin@mediatek.com \
--to=jungo.lin@mediatek.com \
--cc=ddavenport@chromium.org \
--cc=devicetree@vger.kernel.org \
--cc=frankie.chiu@mediatek.com \
--cc=frederic.chen@mediatek.com \
--cc=hverkuil@xs4all.nl \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=mchehab@kernel.org \
--cc=robh@kernel.org \
--cc=ryan.yu@mediatek.com \
--cc=rynn.wu@mediatek.com \
--cc=sean.cheng@mediatek.com \
--cc=sj.huang@mediatek.com \
--cc=srv_heupstream@mediatek.com \
--cc=tfiga@chromium.org \
/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).