From: Paul Elder <paul.elder@ideasonboard.com>
To: linux-media@vger.kernel.org
Cc: Paul Elder <paul.elder@ideasonboard.com>,
Dafna Hirschfeld <dafna@fastmail.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Heiko Stuebner <heiko@sntech.de>,
Helen Koike <helen.koike@collabora.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v3 07/14] media: rkisp1: Add and set registers for output size config on i.MX8MP
Date: Fri, 18 Nov 2022 18:39:24 +0900 [thread overview]
Message-ID: <20221118093931.1284465-8-paul.elder@ideasonboard.com> (raw)
In-Reply-To: <20221118093931.1284465-1-paul.elder@ideasonboard.com>
The ISP version in the i.MX8MP has a set of registers currently not
handled by the driver for output size configuration. Add a feature flag
to determine if the ISP requires this, and set the registers based on
that.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
Changes since v2:
- Document the RKISP1_FEATURE_MAIN_STRIDE bit
- Use the rkisp1_has_feature() macro
---
drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c | 8 ++++++++
drivers/media/platform/rockchip/rkisp1/rkisp1-common.h | 2 ++
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 3 ++-
drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h | 9 +++++++++
4 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
index d4540684ea9a..5c6299ab0f78 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
@@ -420,6 +420,14 @@ static void rkisp1_mp_config(struct rkisp1_capture *cap)
rkisp1_write(rkisp1, cap->config->mi.cr_size_init,
rkisp1_pixfmt_comp_size(pixm, RKISP1_PLANE_CR));
+ if (rkisp1_has_feature(rkisp1, MAIN_STRIDE)) {
+ rkisp1_write(rkisp1, RKISP1_CIF_MI_MP_Y_LLENGTH, pixm->width);
+ rkisp1_write(rkisp1, RKISP1_CIF_MI_MP_Y_PIC_WIDTH, pixm->width);
+ rkisp1_write(rkisp1, RKISP1_CIF_MI_MP_Y_PIC_HEIGHT, pixm->height);
+ rkisp1_write(rkisp1, RKISP1_CIF_MI_MP_Y_PIC_SIZE,
+ pixm->width * pixm->height);
+ }
+
rkisp1_irq_frame_end_enable(cap);
/* set uv swapping for semiplanar formats */
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
index d8851dca026f..047c670b2310 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
@@ -105,6 +105,7 @@ enum rkisp1_isp_pad {
* @RKISP1_FEATURE_MIPI_CSI2: The ISP has an internal MIPI CSI-2 receiver
* @RKISP1_FEATURE_DUAL_CROP: The ISP has the dual crop block at the resizer input
* @RKISP1_FEATURE_RSZ_CROP: The ISP supports cropping in the resizer
+ * @RKISP1_FEATURE_MAIN_STRIDE: The ISP supports configurable stride on the main path
*
* The ISP features are stored in a bitmask in &rkisp1_info.features and allow
* the driver to implement support for features present in some ISP versions
@@ -114,6 +115,7 @@ enum rkisp1_feature {
RKISP1_FEATURE_MIPI_CSI2 = BIT(0),
RKISP1_FEATURE_DUAL_CROP = BIT(1),
RKISP1_FEATURE_RSZ_CROP = BIT(2),
+ RKISP1_FEATURE_MAIN_STRIDE = BIT(3),
};
#define rkisp1_has_feature(rkisp1, feature) \
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
index 4fca4db091c8..1a3ea5a4af05 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
@@ -515,7 +515,8 @@ static const struct rkisp1_info imx8mp_isp_info = {
.isrs = imx8mp_isp_isrs,
.isr_size = ARRAY_SIZE(imx8mp_isp_isrs),
.isp_ver = IMX8MP_V10,
- .features = RKISP1_FEATURE_RSZ_CROP,
+ .features = RKISP1_FEATURE_RSZ_CROP
+ | RKISP1_FEATURE_MAIN_STRIDE,
};
static const struct of_device_id rkisp1_of_match[] = {
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
index cd6ce66945c4..ed34c752be99 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
@@ -1012,6 +1012,15 @@
#define RKISP1_CIF_MI_SP_CB_BASE_AD_INIT2 (RKISP1_CIF_MI_BASE + 0x00000140)
#define RKISP1_CIF_MI_SP_CR_BASE_AD_INIT2 (RKISP1_CIF_MI_BASE + 0x00000144)
#define RKISP1_CIF_MI_XTD_FORMAT_CTRL (RKISP1_CIF_MI_BASE + 0x00000148)
+#define RKISP1_CIF_MI_MP_HANDSHAKE_0 (RKISP1_CIF_MI_BASE + 0x0000014C)
+#define RKISP1_CIF_MI_MP_Y_LLENGTH (RKISP1_CIF_MI_BASE + 0x00000150)
+#define RKISP1_CIF_MI_MP_Y_SLICE_OFFSET (RKISP1_CIF_MI_BASE + 0x00000154)
+#define RKISP1_CIF_MI_MP_C_SLICE_OFFSET (RKISP1_CIF_MI_BASE + 0x00000158)
+#define RKISP1_CIF_MI_OUTPUT_ALIGN_FORMAT (RKISP1_CIF_MI_BASE + 0x0000015C)
+#define RKISP1_CIF_MI_MP_OUTPUT_FIFO_SIZE (RKISP1_CIF_MI_BASE + 0x00000160)
+#define RKISP1_CIF_MI_MP_Y_PIC_WIDTH (RKISP1_CIF_MI_BASE + 0x00000164)
+#define RKISP1_CIF_MI_MP_Y_PIC_HEIGHT (RKISP1_CIF_MI_BASE + 0x00000168)
+#define RKISP1_CIF_MI_MP_Y_PIC_SIZE (RKISP1_CIF_MI_BASE + 0x0000016C)
#define RKISP1_CIF_SMIA_BASE 0x00001A00
#define RKISP1_CIF_SMIA_CTRL (RKISP1_CIF_SMIA_BASE + 0x00000000)
--
2.35.1
next prev parent reply other threads:[~2022-11-18 9:40 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-18 9:39 [PATCH v3 00/14] media: rkisp1: Add support for i.MX8MP Paul Elder
2022-11-18 9:39 ` [PATCH v3 01/14] dt-bindings: media: rkisp1: Add i.MX8MP ISP to compatible Paul Elder
2022-11-18 13:02 ` Krzysztof Kozlowski
2022-11-19 6:31 ` Paul Elder
2022-11-18 9:39 ` [PATCH v3 02/14] dt-bindings: media: rkisp1: Add i.MX8MP ISP example Paul Elder
2022-11-18 13:06 ` Krzysztof Kozlowski
2022-11-19 6:55 ` Paul Elder
2022-11-20 10:36 ` Krzysztof Kozlowski
2022-11-21 5:09 ` Paul Elder
2022-11-21 8:04 ` Krzysztof Kozlowski
2022-11-21 10:38 ` Laurent Pinchart
2022-11-21 11:16 ` Krzysztof Kozlowski
2022-11-21 13:50 ` Laurent Pinchart
2022-11-21 16:37 ` Krzysztof Kozlowski
2022-11-21 16:39 ` Krzysztof Kozlowski
2022-11-21 16:48 ` Laurent Pinchart
2022-11-19 16:59 ` Laurent Pinchart
2022-11-20 10:34 ` Krzysztof Kozlowski
2022-11-18 13:31 ` Rob Herring
2022-11-19 6:33 ` Paul Elder
2022-11-18 9:39 ` [PATCH v3 03/14] media: rkisp1: Add and use rkisp1_has_feature() macro Paul Elder
2022-11-19 11:03 ` Dafna Hirschfeld
2022-11-19 17:18 ` Laurent Pinchart
2022-11-18 9:39 ` [PATCH v3 04/14] media: rkisp1: Add match data for i.MX8MP ISP Paul Elder
2023-10-18 17:41 ` Adam Ford
2022-11-18 9:39 ` [PATCH v3 05/14] media: rkisp1: Configure gasket on i.MX8MP Paul Elder
2022-11-18 9:39 ` [PATCH v3 06/14] media: rkisp1: Add and set registers for crop for i.MX8MP Paul Elder
2022-11-18 9:39 ` Paul Elder [this message]
2022-11-18 9:39 ` [PATCH v3 08/14] media: rkisp1: Add i.MX8MP-specific registers for MI and resizer Paul Elder
2022-11-18 9:39 ` [PATCH v3 09/14] media: rkisp1: Shift DMA buffer addresses on i.MX8MP Paul Elder
2022-11-18 9:39 ` [PATCH v3 10/14] media: rkisp1: Add register definitions for the test pattern generator Paul Elder
2022-11-18 9:39 ` [PATCH v3 11/14] media: rkisp1: Fix RSZ_CTRL bits for i.MX8MP Paul Elder
2022-11-18 9:39 ` [PATCH v3 12/14] media: rkisp1: Support devices without self path Paul Elder
2022-11-18 9:39 ` [PATCH v3 13/14] media: rkisp1: Add YC swap capability Paul Elder
2022-11-18 9:39 ` [PATCH v3 14/14] media: rkisp1: Add UYVY as an output format Paul Elder
[not found] ` <CAHCN7x+9E8qcBVOQZKTKagDkvkKVnqDtjvpNX-iNFYwCLRoYug@mail.gmail.com>
2023-02-15 23:55 ` [PATCH v3 00/14] media: rkisp1: Add support for i.MX8MP Laurent Pinchart
2023-02-18 16:14 ` Adam Ford
2023-02-23 10:58 ` Jacopo Mondi
2023-02-22 23:39 ` Adam Ford
2023-02-23 13:57 ` Jacopo Mondi
2023-02-23 14:26 ` Laurent Pinchart
2023-02-23 16:10 ` Adam Ford
2023-02-23 16:25 ` Laurent Pinchart
2023-02-24 18:24 ` Nicolas Dufresne
2023-02-24 18:46 ` Adam Ford
2023-03-21 14:43 ` Tommaso Merciai
2023-07-18 8:31 ` Hans Verkuil
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=20221118093931.1284465-8-paul.elder@ideasonboard.com \
--to=paul.elder@ideasonboard.com \
--cc=dafna@fastmail.com \
--cc=devicetree@vger.kernel.org \
--cc=heiko@sntech.de \
--cc=helen.koike@collabora.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mchehab@kernel.org \
--cc=robh+dt@kernel.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).