From: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
To: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Cc: linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org,
"Sakari Ailus" <sakari.ailus@iki.fi>,
"Kieran Bingham" <kieran.bingham@ideasonboard.com>,
"Niklas Söderlund" <niklas.soderlund@ragnatech.se>,
"Jacopo Mondi" <jacopo@jmondi.org>,
"Maxime Ripard" <mripard@kernel.org>,
"Pratyush Yadav" <p.yadav@ti.com>
Subject: Re: [PATCH 5/6] media: rockchip: rkisp1: Use mipi-csi2.h
Date: Thu, 3 Feb 2022 11:11:27 +0200 [thread overview]
Message-ID: <20220203085748.346rcafqno2ipnhs@guri> (raw)
In-Reply-To: <20220123160857.24161-6-laurent.pinchart+renesas@ideasonboard.com>
Tested on rock-pi4 with few libcamera's 'cam' commands on several pixelformats
Tested-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Reviewed-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
On 23.01.2022 18:08, Laurent Pinchart wrote:
> Replace the driver-specific definitions of MIPI CSI-2 data types with
> macros from mipi-csi2.h.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
> .../platform/rockchip/rkisp1/rkisp1-isp.c | 34 ++++++++++---------
> .../platform/rockchip/rkisp1/rkisp1-regs.h | 11 ------
> 2 files changed, 18 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> index 2a35bf24e54e..4415c7248c2f 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> @@ -14,6 +14,8 @@
> #include <linux/pm_runtime.h>
> #include <linux/videodev2.h>
> #include <linux/vmalloc.h>
> +
> +#include <media/mipi-csi2.h>
> #include <media/v4l2-event.h>
>
> #include "rkisp1-common.h"
> @@ -62,112 +64,112 @@ static const struct rkisp1_isp_mbus_info rkisp1_isp_formats[] = {
> }, {
> .mbus_code = MEDIA_BUS_FMT_SRGGB10_1X10,
> .pixel_enc = V4L2_PIXEL_ENC_BAYER,
> - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10,
> + .mipi_dt = MIPI_CSI2_DT_RAW10,
> .bayer_pat = RKISP1_RAW_RGGB,
> .bus_width = 10,
> .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
> }, {
> .mbus_code = MEDIA_BUS_FMT_SBGGR10_1X10,
> .pixel_enc = V4L2_PIXEL_ENC_BAYER,
> - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10,
> + .mipi_dt = MIPI_CSI2_DT_RAW10,
> .bayer_pat = RKISP1_RAW_BGGR,
> .bus_width = 10,
> .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
> }, {
> .mbus_code = MEDIA_BUS_FMT_SGBRG10_1X10,
> .pixel_enc = V4L2_PIXEL_ENC_BAYER,
> - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10,
> + .mipi_dt = MIPI_CSI2_DT_RAW10,
> .bayer_pat = RKISP1_RAW_GBRG,
> .bus_width = 10,
> .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
> }, {
> .mbus_code = MEDIA_BUS_FMT_SGRBG10_1X10,
> .pixel_enc = V4L2_PIXEL_ENC_BAYER,
> - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW10,
> + .mipi_dt = MIPI_CSI2_DT_RAW10,
> .bayer_pat = RKISP1_RAW_GRBG,
> .bus_width = 10,
> .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
> }, {
> .mbus_code = MEDIA_BUS_FMT_SRGGB12_1X12,
> .pixel_enc = V4L2_PIXEL_ENC_BAYER,
> - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12,
> + .mipi_dt = MIPI_CSI2_DT_RAW12,
> .bayer_pat = RKISP1_RAW_RGGB,
> .bus_width = 12,
> .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
> }, {
> .mbus_code = MEDIA_BUS_FMT_SBGGR12_1X12,
> .pixel_enc = V4L2_PIXEL_ENC_BAYER,
> - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12,
> + .mipi_dt = MIPI_CSI2_DT_RAW12,
> .bayer_pat = RKISP1_RAW_BGGR,
> .bus_width = 12,
> .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
> }, {
> .mbus_code = MEDIA_BUS_FMT_SGBRG12_1X12,
> .pixel_enc = V4L2_PIXEL_ENC_BAYER,
> - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12,
> + .mipi_dt = MIPI_CSI2_DT_RAW12,
> .bayer_pat = RKISP1_RAW_GBRG,
> .bus_width = 12,
> .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
> }, {
> .mbus_code = MEDIA_BUS_FMT_SGRBG12_1X12,
> .pixel_enc = V4L2_PIXEL_ENC_BAYER,
> - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW12,
> + .mipi_dt = MIPI_CSI2_DT_RAW12,
> .bayer_pat = RKISP1_RAW_GRBG,
> .bus_width = 12,
> .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
> }, {
> .mbus_code = MEDIA_BUS_FMT_SRGGB8_1X8,
> .pixel_enc = V4L2_PIXEL_ENC_BAYER,
> - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8,
> + .mipi_dt = MIPI_CSI2_DT_RAW8,
> .bayer_pat = RKISP1_RAW_RGGB,
> .bus_width = 8,
> .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
> }, {
> .mbus_code = MEDIA_BUS_FMT_SBGGR8_1X8,
> .pixel_enc = V4L2_PIXEL_ENC_BAYER,
> - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8,
> + .mipi_dt = MIPI_CSI2_DT_RAW8,
> .bayer_pat = RKISP1_RAW_BGGR,
> .bus_width = 8,
> .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
> }, {
> .mbus_code = MEDIA_BUS_FMT_SGBRG8_1X8,
> .pixel_enc = V4L2_PIXEL_ENC_BAYER,
> - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8,
> + .mipi_dt = MIPI_CSI2_DT_RAW8,
> .bayer_pat = RKISP1_RAW_GBRG,
> .bus_width = 8,
> .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
> }, {
> .mbus_code = MEDIA_BUS_FMT_SGRBG8_1X8,
> .pixel_enc = V4L2_PIXEL_ENC_BAYER,
> - .mipi_dt = RKISP1_CIF_CSI2_DT_RAW8,
> + .mipi_dt = MIPI_CSI2_DT_RAW8,
> .bayer_pat = RKISP1_RAW_GRBG,
> .bus_width = 8,
> .direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
> }, {
> .mbus_code = MEDIA_BUS_FMT_YUYV8_1X16,
> .pixel_enc = V4L2_PIXEL_ENC_YUV,
> - .mipi_dt = RKISP1_CIF_CSI2_DT_YUV422_8b,
> + .mipi_dt = MIPI_CSI2_DT_YUV422_8B,
> .yuv_seq = RKISP1_CIF_ISP_ACQ_PROP_YCBYCR,
> .bus_width = 16,
> .direction = RKISP1_ISP_SD_SINK,
> }, {
> .mbus_code = MEDIA_BUS_FMT_YVYU8_1X16,
> .pixel_enc = V4L2_PIXEL_ENC_YUV,
> - .mipi_dt = RKISP1_CIF_CSI2_DT_YUV422_8b,
> + .mipi_dt = MIPI_CSI2_DT_YUV422_8B,
> .yuv_seq = RKISP1_CIF_ISP_ACQ_PROP_YCRYCB,
> .bus_width = 16,
> .direction = RKISP1_ISP_SD_SINK,
> }, {
> .mbus_code = MEDIA_BUS_FMT_UYVY8_1X16,
> .pixel_enc = V4L2_PIXEL_ENC_YUV,
> - .mipi_dt = RKISP1_CIF_CSI2_DT_YUV422_8b,
> + .mipi_dt = MIPI_CSI2_DT_YUV422_8B,
> .yuv_seq = RKISP1_CIF_ISP_ACQ_PROP_CBYCRY,
> .bus_width = 16,
> .direction = RKISP1_ISP_SD_SINK,
> }, {
> .mbus_code = MEDIA_BUS_FMT_VYUY8_1X16,
> .pixel_enc = V4L2_PIXEL_ENC_YUV,
> - .mipi_dt = RKISP1_CIF_CSI2_DT_YUV422_8b,
> + .mipi_dt = MIPI_CSI2_DT_YUV422_8B,
> .yuv_seq = RKISP1_CIF_ISP_ACQ_PROP_CRYCBY,
> .bus_width = 16,
> .direction = RKISP1_ISP_SD_SINK,
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
> index d326214c7e07..82f8d33d98b3 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
> @@ -333,17 +333,6 @@
> /* MIPI_DATA_SEL */
> #define RKISP1_CIF_MIPI_DATA_SEL_VC(a) (((a) & 0x3) << 6)
> #define RKISP1_CIF_MIPI_DATA_SEL_DT(a) (((a) & 0x3F) << 0)
> -/* MIPI DATA_TYPE */
> -#define RKISP1_CIF_CSI2_DT_YUV420_8b 0x18
> -#define RKISP1_CIF_CSI2_DT_YUV420_10b 0x19
> -#define RKISP1_CIF_CSI2_DT_YUV422_8b 0x1E
> -#define RKISP1_CIF_CSI2_DT_YUV422_10b 0x1F
> -#define RKISP1_CIF_CSI2_DT_RGB565 0x22
> -#define RKISP1_CIF_CSI2_DT_RGB666 0x23
> -#define RKISP1_CIF_CSI2_DT_RGB888 0x24
> -#define RKISP1_CIF_CSI2_DT_RAW8 0x2A
> -#define RKISP1_CIF_CSI2_DT_RAW10 0x2B
> -#define RKISP1_CIF_CSI2_DT_RAW12 0x2C
>
> /* MIPI_IMSC, MIPI_RIS, MIPI_MIS, MIPI_ICR, MIPI_ISR */
> #define RKISP1_CIF_MIPI_SYNC_FIFO_OVFLW(a) (((a) & 0xF) << 0)
> --
> Regards,
>
> Laurent Pinchart
>
next prev parent reply other threads:[~2022-02-03 9:11 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-23 16:08 [PATCH 0/6] media: Centralize MIPI CSI-2 data types in shared header Laurent Pinchart
2022-01-23 16:08 ` [PATCH 1/6] media: Define MIPI CSI-2 data types in a shared header file Laurent Pinchart
2022-01-24 9:06 ` Niklas Söderlund
2022-01-24 15:22 ` Pratyush Yadav
2022-01-26 11:50 ` Dave Stevenson
2022-01-26 11:59 ` Laurent Pinchart
2022-01-26 9:47 ` Kieran Bingham
2022-01-26 11:57 ` Laurent Pinchart
2022-01-23 16:08 ` [PATCH 2/6] media: cadence: cdns-csi2tx: Use mipi-csi2.h Laurent Pinchart
2022-04-14 14:42 ` Laurent Pinchart
2022-01-23 16:08 ` [PATCH 3/6] media: rcar-isp: " Laurent Pinchart
2022-01-24 9:07 ` Niklas Söderlund
2022-01-23 16:08 ` [PATCH 4/6] media: rcar-csi2: " Laurent Pinchart
2022-01-24 9:10 ` Niklas Söderlund
2022-01-23 16:08 ` [PATCH 5/6] media: rockchip: rkisp1: " Laurent Pinchart
2022-02-03 9:11 ` Dafna Hirschfeld [this message]
2022-01-23 16:08 ` [PATCH 6/6] media: xilinx: csi2rxss: " Laurent Pinchart
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=20220203085748.346rcafqno2ipnhs@guri \
--to=dafna.hirschfeld@collabora.com \
--cc=jacopo@jmondi.org \
--cc=kieran.bingham@ideasonboard.com \
--cc=laurent.pinchart+renesas@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=mripard@kernel.org \
--cc=niklas.soderlund@ragnatech.se \
--cc=p.yadav@ti.com \
--cc=sakari.ailus@iki.fi \
/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