Linux-Rockchip Archive on lore.kernel.org
 help / color / mirror / Atom feed
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 08/14] media: rkisp1: Add i.MX8MP-specific registers for MI and resizer
Date: Fri, 18 Nov 2022 18:39:25 +0900	[thread overview]
Message-ID: <20221118093931.1284465-9-paul.elder@ideasonboard.com> (raw)
In-Reply-To: <20221118093931.1284465-1-paul.elder@ideasonboard.com>

Add register definitions for resizer format conversion control and for
the memory interface output that are specific to the ISP version in the
i.MX8MP.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
---
Changes since v2:

- Add missing newlines
---
 .../platform/rockchip/rkisp1/rkisp1-regs.h    | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
index ed34c752be99..6597c563f892 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
@@ -171,6 +171,23 @@
 /* RSZ_CROP_[XY]_DIR */
 #define RKISP1_CIF_RSZ_CROP_XY_DIR(start, end)		((end) << 16 | (start) << 0)
 
+/* RSZ_FORMAT_CONV_CTRL */
+#define RKISP1_CIF_RSZ_FORMAT_CONV_CTRL_RSZ_INPUT_FORMAT_YCBCR_400	(0 << 0)
+#define RKISP1_CIF_RSZ_FORMAT_CONV_CTRL_RSZ_INPUT_FORMAT_YCBCR_420	(1 << 0)
+#define RKISP1_CIF_RSZ_FORMAT_CONV_CTRL_RSZ_INPUT_FORMAT_YCBCR_422	(2 << 0)
+#define RKISP1_CIF_RSZ_FORMAT_CONV_CTRL_RSZ_INPUT_FORMAT_YCBCR_444	(3 << 0)
+#define RKISP1_CIF_RSZ_FORMAT_CONV_CTRL_RSZ_OUTPUT_FORMAT_YCBCR_400	(0 << 2)
+#define RKISP1_CIF_RSZ_FORMAT_CONV_CTRL_RSZ_OUTPUT_FORMAT_YCBCR_420	(1 << 2)
+#define RKISP1_CIF_RSZ_FORMAT_CONV_CTRL_RSZ_OUTPUT_FORMAT_YCBCR_422	(2 << 2)
+#define RKISP1_CIF_RSZ_FORMAT_CONV_CTRL_RSZ_OUTPUT_FORMAT_YCBCR_444	(3 << 2)
+#define RKISP1_CIF_RSZ_FORMAT_CONV_CTRL_CFG_Y_FULL			BIT(5)
+#define RKISP1_CIF_RSZ_FORMAT_CONV_CTRL_CFG_CBCR_FULL			BIT(6)
+#define RKISP1_CIF_RSZ_FORMAT_CONV_CTRL_CFG_422NOCOSITED		BIT(7)
+#define RKISP1_CIF_RSZ_FORMAT_CONV_CTRL_DATA_WIDTH_10_BIT_ENABLE	BIT(8)
+#define RKISP1_CIF_RSZ_FORMAT_CONV_CTRL_DATA_WIDTH_10_BIT_METHOD	BIT(9)
+#define RKISP1_CIF_RSZ_FORMAT_CONV_CTRL_RSZ_PACK_FORMAT_PLANAR		(0 << 10)
+#define RKISP1_CIF_RSZ_FORMAT_CONV_CTRL_RSZ_PACK_FORMAT_SEMI_PLANAR	(1 << 10)
+
 /* MI_IMSC - MI_MIS - MI_RIS - MI_ICR - MI_ISR */
 #define RKISP1_CIF_MI_FRAME(stream)			BIT((stream)->id)
 #define RKISP1_CIF_MI_MBLK_LINE				BIT(2)
@@ -213,6 +230,24 @@
 #define RKISP1_CIF_MI_XTD_FMT_CTRL_SP_CB_CR_SWAP	BIT(1)
 #define RKISP1_CIF_MI_XTD_FMT_CTRL_DMA_CB_CR_SWAP	BIT(2)
 
+/* MI_OUTPUT_ALIGN_FORMAT */
+#define RKISP1_CIF_OUTPUT_ALIGN_FORMAT_MP_LSB_ALIGNMENT			BIT(0)
+#define RKISP1_CIF_OUTPUT_ALIGN_FORMAT_MP_BYTE_SWAP_BYTES		BIT(1)
+#define RKISP1_CIF_OUTPUT_ALIGN_FORMAT_MP_BYTE_SWAP_WORDS		BIT(2)
+#define RKISP1_CIF_OUTPUT_ALIGN_FORMAT_MP_BYTE_SWAP_DWORDS		BIT(3)
+#define RKISP1_CIF_OUTPUT_ALIGN_FORMAT_SP_BYTE_SWAP_BYTES		BIT(4)
+#define RKISP1_CIF_OUTPUT_ALIGN_FORMAT_SP_BYTE_SWAP_WORDS		BIT(5)
+#define RKISP1_CIF_OUTPUT_ALIGN_FORMAT_SP_BYTE_SWAP_DWORDS		BIT(6)
+#define RKISP1_CIF_OUTPUT_ALIGN_FORMAT_DMA_BYTE_SWAP_BYTES		BIT(7)
+#define RKISP1_CIF_OUTPUT_ALIGN_FORMAT_DMA_BYTE_SWAP_WORDS		BIT(8)
+#define RKISP1_CIF_OUTPUT_ALIGN_FORMAT_DMA_BYTE_SWAP_DWORDS		BIT(9)
+
+/* MI_MP_OUTPUT_FIFO_SIZE */
+#define RKISP1_CIF_MI_MP_OUTPUT_FIFO_SIZE_OUTPUT_FIFO_DEPTH_FULL	(0 << 0)
+#define RKISP1_CIF_MI_MP_OUTPUT_FIFO_SIZE_OUTPUT_FIFO_DEPTH_HALF	(1 << 0)
+#define RKISP1_CIF_MI_MP_OUTPUT_FIFO_SIZE_OUTPUT_FIFO_DEPTH_QUARTER	(2 << 0)
+#define RKISP1_CIF_MI_MP_OUTPUT_FIFO_SIZE_OUTPUT_FIFO_DEPTH_EIGHT	(3 << 0)
+
 /* VI_CCL */
 #define RKISP1_CIF_CCL_CIF_CLK_DIS			BIT(2)
 /* VI_ISP_CLK_CTRL */
-- 
2.35.1


_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

  parent reply	other threads:[~2022-11-18  9:43 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 ` [PATCH v3 07/14] media: rkisp1: Add and set registers for output size config on i.MX8MP Paul Elder
2022-11-18  9:39 ` Paul Elder [this message]
2022-11-18  9:39 ` [PATCH v3 09/14] media: rkisp1: Shift DMA buffer addresses " 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-9-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