From: Jungo Lin <jungo.lin@mediatek.com>
To: <tfiga@chromium.org>, <hans.verkuil@cisco.com>,
<laurent.pinchart+renesas@ideasonboard.com>,
<matthias.bgg@gmail.com>, <mchehab@kernel.org>
Cc: Sean.Cheng@mediatek.com, Rynn.Wu@mediatek.com,
srv_heupstream@mediatek.com, holmes.chiou@mediatek.com,
ryan.yu@mediatek.com, Jerry-ch.Chen@mediatek.com,
frankie.chiu@mediatek.com, jungo.lin@mediatek.com,
sj.huang@mediatek.com, yuzhao@chromium.org,
christie.yu@mediatek.com, seraph.huang@mediatek.com,
zwisler@chromium.org, linux-mediatek@lists.infradead.org,
frederic.chen@mediatek.com, linux-arm-kernel@lists.infradead.org,
linux-media@vger.kernel.org
Subject: [RFC V1 08/12] media: platform: Add Mediatek ISP P1 private control
Date: Thu, 28 Mar 2019 17:56:43 +0800 [thread overview]
Message-ID: <1553767007-11909-9-git-send-email-jungo.lin@mediatek.com> (raw)
In-Reply-To: <1553767007-11909-1-git-send-email-jungo.lin@mediatek.com>
Reserved Mediatek ISP P1 private control number with 16.
Moreover, add two private controls for ISP P1 user space
usage.
1. V4L2_CID_PRIVATE_GET_BIN_INFO
- Provide the image output width & height in case
camera binning mode is enabled.
2. V4L2_CID_PRIVATE_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 image path is pure raw.
Signed-off-by: Jungo Lin <jungo.lin@mediatek.com>
---
.../platform/mtk-isp/isp_50/cam/mtk_cam-ctrl.c | 133 +++++++++++++++++++++
.../platform/mtk-isp/isp_50/cam/mtk_cam-ctrl.h | 32 +++++
include/uapi/linux/v4l2-controls.h | 4 +
3 files changed, 169 insertions(+)
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/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 0000000..455216a
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-ctrl.c
@@ -0,0 +1,133 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2018 MediaTek Inc.
+ * Author: Ryan Yu <ryan.yu@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include "mtk_cam-dev.h"
+#include "mtk_cam-ctrl.h"
+#include "mtk_cam.h"
+
+static int handle_ctrl_get_bin_info(struct v4l2_ctrl *ctrl)
+{
+ struct mtk_cam_dev *cam_dev = ctrl->priv;
+ const unsigned int idx = MTK_CAM_P1_MAIN_STREAM_OUT;
+ struct v4l2_format *imgo_fmt = &cam_dev->mem2mem2_nodes[idx].vdev_fmt;
+ unsigned int width, height;
+
+ width = imgo_fmt->fmt.pix_mp.width;
+ height = imgo_fmt->fmt.pix_mp.height;
+
+ dev_dbg(&cam_dev->pdev->dev, "Get bin info w*h:(%d*%d)",
+ width, height);
+
+ ctrl->val = (width << 16) | height;
+
+ return 0;
+}
+
+static int handle_ctrl_get_raw_path(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;
+
+ dev_dbg(&cam_dev->pdev->dev, "Get raw path:%d", ctrl->val);
+
+ return 0;
+}
+
+static int handle_ctrl_set_raw_path(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;
+ dev_dbg(&cam_dev->pdev->dev, "Set raw path:%d", ctrl->val);
+ return 0;
+}
+
+static int mtk_cam_dev_g_ctrl(struct v4l2_ctrl *ctrl)
+{
+ switch (ctrl->id) {
+ case V4L2_CID_PRIVATE_GET_BIN_INFO:
+ handle_ctrl_get_bin_info(ctrl);
+ break;
+ case V4L2_CID_PRIVATE_RAW_PATH:
+ handle_ctrl_get_raw_path(ctrl);
+ break;
+ default:
+ return -EINVAL;
+ }
+ return 0;
+}
+
+static int mtk_cam_dev_s_ctrl(struct v4l2_ctrl *ctrl)
+{
+ switch (ctrl->id) {
+ case V4L2_CID_PRIVATE_RAW_PATH:
+ return handle_ctrl_set_raw_path(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_PRIVATE_GET_BIN_INFO,
+ .name = "MTK CAM GET BIN INFO",
+ .type = V4L2_CTRL_TYPE_INTEGER,
+ .min = (IMG_MIN_WIDTH << 16) | IMG_MIN_HEIGHT,
+ .max = (IMG_MAX_WIDTH << 16) | IMG_MAX_HEIGHT,
+ .step = 1,
+ .def = (IMG_MAX_WIDTH << 16) | IMG_MAX_HEIGHT,
+ .flags = V4L2_CTRL_FLAG_READ_ONLY | V4L2_CTRL_FLAG_VOLATILE,
+ },
+ {
+ .ops = &mtk_cam_dev_ctrl_ops,
+ .id = V4L2_CID_PRIVATE_RAW_PATH,
+ .name = "MTK CAM RAW PATH",
+ .type = V4L2_CTRL_TYPE_BOOLEAN,
+ .min = 0,
+ .max = 1,
+ .step = 1,
+ .def = 1,
+ },
+};
+
+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_info(&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 0000000..74a6538
--- /dev/null
+++ b/drivers/media/platform/mtk-isp/isp_50/cam/mtk_cam-ctrl.h
@@ -0,0 +1,32 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (c) 2018 MediaTek Inc.
+ * Author: Ryan Yu <ryan.yu@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __MTK_CAM_CTRL_H__
+#define __MTK_CAM_CTRL_H__
+
+#include <media/v4l2-ctrls.h>
+
+#define V4L2_CID_MTK_CAM_PRIVATE_CAM V4L2_CID_USER_MTK_CAM_BASE
+#define V4L2_CID_PRIVATE_GET_BIN_INFO \
+ (V4L2_CID_MTK_CAM_PRIVATE_CAM + 1)
+#define V4L2_CID_PRIVATE_RAW_PATH \
+ (V4L2_CID_MTK_CAM_PRIVATE_CAM + 2)
+
+#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 06479f2..cbe8f5f 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 */
--
1.9.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-03-28 9:58 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-28 9:56 [RFC V1 00/12] meida: platform: mtk-isp: Add Mediatek ISP Pass 1 driver Jungo Lin
2019-03-28 9:56 ` [RFC V1 01/12] dt-bindings: mt8183: Add binding for ISP Pass 1 reserved memory Jungo Lin
2019-03-28 9:56 ` [RFC V1 02/12] dts: arm64: mt8183: Add ISP Pass 1 shared memory node Jungo Lin
2019-03-28 9:56 ` [RFC V1 03/12] dt-bindings: mt8183: Added cam-smem dt-bindings Jungo Lin
2019-03-28 9:56 ` [RFC V1 04/12] dt-bindings: mt8183: Added camera ISP Pass 1 Jungo Lin
2019-03-28 9:56 ` [RFC V1 05/12] dts: arm64: mt8183: Add ISP Pass 1 nodes Jungo Lin
2019-03-28 9:56 ` [RFC V1 06/12] media: platform: Add Mediatek ISP Pass 1 driver Kconfig Jungo Lin
2019-03-28 9:56 ` [RFC V1 07/12] media: platform: Add Mediatek ISP P1 image & meta formats Jungo Lin
2019-03-28 9:56 ` Jungo Lin [this message]
2019-03-28 9:56 ` [RFC V1 09/12] media: platform: Add Mediatek ISP P1 V4L2 functions Jungo Lin
2019-03-28 9:56 ` [RFC V1 10/12] media: platform: Add Mediatek ISP P1 device driver Jungo Lin
2019-03-28 9:56 ` [RFC V1 11/12] media: platform: Add Mediatek ISP P1 SCP communication Jungo Lin
2019-03-28 9:56 ` [RFC V1 12/12] media: platform: Add Mediatek ISP P1 shared memory driver Jungo Lin
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=1553767007-11909-9-git-send-email-jungo.lin@mediatek.com \
--to=jungo.lin@mediatek.com \
--cc=Jerry-ch.Chen@mediatek.com \
--cc=Rynn.Wu@mediatek.com \
--cc=Sean.Cheng@mediatek.com \
--cc=christie.yu@mediatek.com \
--cc=frankie.chiu@mediatek.com \
--cc=frederic.chen@mediatek.com \
--cc=hans.verkuil@cisco.com \
--cc=holmes.chiou@mediatek.com \
--cc=laurent.pinchart+renesas@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=ryan.yu@mediatek.com \
--cc=seraph.huang@mediatek.com \
--cc=sj.huang@mediatek.com \
--cc=srv_heupstream@mediatek.com \
--cc=tfiga@chromium.org \
--cc=yuzhao@chromium.org \
--cc=zwisler@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).