From: Eugen Hristev <eugen.hristev@microchip.com>
To: <devicetree@vger.kernel.org>, <linux-media@vger.kernel.org>,
<jacopo@jmondi.org>, <robh+dt@kernel.org>
Cc: <linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>,
Eugen Hristev <eugen.hristev@microchip.com>
Subject: [PATCH v3 27/33] media: atmel: atmel-isc-base: add support for more formats and additional pipeline modules
Date: Tue, 13 Apr 2021 13:57:25 +0300 [thread overview]
Message-ID: <20210413105731.610028-28-eugen.hristev@microchip.com> (raw)
In-Reply-To: <20210413105731.610028-1-eugen.hristev@microchip.com>
Add support for additional formats supported by newer pipelines, and for
additional pipeline modules.
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
drivers/media/platform/atmel/atmel-isc-base.c | 48 +++++++++++++++----
1 file changed, 38 insertions(+), 10 deletions(-)
diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
index a3c299068bd5..f30493a1dccd 100644
--- a/drivers/media/platform/atmel/atmel-isc-base.c
+++ b/drivers/media/platform/atmel/atmel-isc-base.c
@@ -843,6 +843,8 @@ static int isc_try_validate_formats(struct isc_device *isc)
case V4L2_PIX_FMT_YUV420:
case V4L2_PIX_FMT_YUV422P:
case V4L2_PIX_FMT_YUYV:
+ case V4L2_PIX_FMT_UYVY:
+ case V4L2_PIX_FMT_VYUY:
ret = 0;
yuv = true;
break;
@@ -857,6 +859,7 @@ static int isc_try_validate_formats(struct isc_device *isc)
break;
case V4L2_PIX_FMT_GREY:
case V4L2_PIX_FMT_Y10:
+ case V4L2_PIX_FMT_Y16:
ret = 0;
grey = true;
break;
@@ -887,6 +890,8 @@ static int isc_try_validate_formats(struct isc_device *isc)
*/
static int isc_try_configure_rlp_dma(struct isc_device *isc, bool direct_dump)
{
+ isc->try_config.rlp_cfg_mode = 0;
+
switch (isc->try_config.fourcc) {
case V4L2_PIX_FMT_SBGGR8:
case V4L2_PIX_FMT_SGBRG8:
@@ -953,7 +958,19 @@ static int isc_try_configure_rlp_dma(struct isc_device *isc, bool direct_dump)
isc->try_config.bpp = 16;
break;
case V4L2_PIX_FMT_YUYV:
- isc->try_config.rlp_cfg_mode = ISC_RLP_CFG_MODE_YYCC;
+ isc->try_config.rlp_cfg_mode = ISC_RLP_CFG_MODE_YCYC | ISC_RLP_CFG_YMODE_YUYV;
+ isc->try_config.dcfg_imode = ISC_DCFG_IMODE_PACKED32;
+ isc->try_config.dctrl_dview = ISC_DCTRL_DVIEW_PACKED;
+ isc->try_config.bpp = 16;
+ break;
+ case V4L2_PIX_FMT_UYVY:
+ isc->try_config.rlp_cfg_mode = ISC_RLP_CFG_MODE_YCYC | ISC_RLP_CFG_YMODE_UYVY;
+ isc->try_config.dcfg_imode = ISC_DCFG_IMODE_PACKED32;
+ isc->try_config.dctrl_dview = ISC_DCTRL_DVIEW_PACKED;
+ isc->try_config.bpp = 16;
+ break;
+ case V4L2_PIX_FMT_VYUY:
+ isc->try_config.rlp_cfg_mode = ISC_RLP_CFG_MODE_YCYC | ISC_RLP_CFG_YMODE_VYUY;
isc->try_config.dcfg_imode = ISC_DCFG_IMODE_PACKED32;
isc->try_config.dctrl_dview = ISC_DCTRL_DVIEW_PACKED;
isc->try_config.bpp = 16;
@@ -964,8 +981,11 @@ static int isc_try_configure_rlp_dma(struct isc_device *isc, bool direct_dump)
isc->try_config.dctrl_dview = ISC_DCTRL_DVIEW_PACKED;
isc->try_config.bpp = 8;
break;
+ case V4L2_PIX_FMT_Y16:
+ isc->try_config.rlp_cfg_mode = ISC_RLP_CFG_MODE_DATY10 | ISC_RLP_CFG_LSH;
+ fallthrough;
case V4L2_PIX_FMT_Y10:
- isc->try_config.rlp_cfg_mode = ISC_RLP_CFG_MODE_DATY10;
+ isc->try_config.rlp_cfg_mode |= ISC_RLP_CFG_MODE_DATY10;
isc->try_config.dcfg_imode = ISC_DCFG_IMODE_PACKED16;
isc->try_config.dctrl_dview = ISC_DCTRL_DVIEW_PACKED;
isc->try_config.bpp = 16;
@@ -999,7 +1019,8 @@ static int isc_try_configure_pipeline(struct isc_device *isc)
/* if sensor format is RAW, we convert inside ISC */
if (ISC_IS_FORMAT_RAW(isc->try_config.sd_format->mbus_code)) {
isc->try_config.bits_pipeline = CFA_ENABLE |
- WB_ENABLE | GAM_ENABLES;
+ WB_ENABLE | GAM_ENABLES | DPC_BLCENABLE |
+ CC_ENABLE;
} else {
isc->try_config.bits_pipeline = 0x0;
}
@@ -1008,8 +1029,9 @@ static int isc_try_configure_pipeline(struct isc_device *isc)
/* if sensor format is RAW, we convert inside ISC */
if (ISC_IS_FORMAT_RAW(isc->try_config.sd_format->mbus_code)) {
isc->try_config.bits_pipeline = CFA_ENABLE |
- CSC_ENABLE | WB_ENABLE | GAM_ENABLES |
- SUB420_ENABLE | SUB422_ENABLE | CBC_ENABLE;
+ CSC_ENABLE | GAM_ENABLES | WB_ENABLE |
+ SUB420_ENABLE | SUB422_ENABLE | CBC_ENABLE |
+ DPC_BLCENABLE;
} else {
isc->try_config.bits_pipeline = 0x0;
}
@@ -1019,33 +1041,39 @@ static int isc_try_configure_pipeline(struct isc_device *isc)
if (ISC_IS_FORMAT_RAW(isc->try_config.sd_format->mbus_code)) {
isc->try_config.bits_pipeline = CFA_ENABLE |
CSC_ENABLE | WB_ENABLE | GAM_ENABLES |
- SUB422_ENABLE | CBC_ENABLE;
+ SUB422_ENABLE | CBC_ENABLE | DPC_BLCENABLE;
} else {
isc->try_config.bits_pipeline = 0x0;
}
break;
case V4L2_PIX_FMT_YUYV:
+ case V4L2_PIX_FMT_UYVY:
+ case V4L2_PIX_FMT_VYUY:
/* if sensor format is RAW, we convert inside ISC */
if (ISC_IS_FORMAT_RAW(isc->try_config.sd_format->mbus_code)) {
isc->try_config.bits_pipeline = CFA_ENABLE |
CSC_ENABLE | WB_ENABLE | GAM_ENABLES |
- SUB422_ENABLE | CBC_ENABLE;
+ SUB422_ENABLE | CBC_ENABLE | DPC_BLCENABLE;
} else {
isc->try_config.bits_pipeline = 0x0;
}
break;
case V4L2_PIX_FMT_GREY:
- if (ISC_IS_FORMAT_RAW(isc->try_config.sd_format->mbus_code)) {
+ case V4L2_PIX_FMT_Y16:
/* if sensor format is RAW, we convert inside ISC */
+ if (ISC_IS_FORMAT_RAW(isc->try_config.sd_format->mbus_code)) {
isc->try_config.bits_pipeline = CFA_ENABLE |
CSC_ENABLE | WB_ENABLE | GAM_ENABLES |
- CBC_ENABLE;
+ CBC_ENABLE | DPC_BLCENABLE;
} else {
isc->try_config.bits_pipeline = 0x0;
}
break;
default:
- isc->try_config.bits_pipeline = 0x0;
+ if (ISC_IS_FORMAT_RAW(isc->try_config.sd_format->mbus_code))
+ isc->try_config.bits_pipeline = WB_ENABLE | DPC_BLCENABLE;
+ else
+ isc->try_config.bits_pipeline = 0x0;
}
/* Tune the pipeline to product specific */
--
2.25.1
next prev parent reply other threads:[~2021-04-13 11:04 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-13 10:56 [PATCH v3 00/33] media: atmel: atmel-isc: add support for xisc Eugen Hristev
2021-04-13 10:56 ` [PATCH v3 01/33] media: atmel: atmel-isc: specialize gamma table into product specific Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 02/33] media: atmel: atmel-isc: specialize driver name constant Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 03/33] media: atmel: atmel-isc: add checks for limiting frame sizes Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 04/33] media: atmel: atmel-isc: specialize max width and max height Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 05/33] media: atmel: atmel-isc: specialize dma cfg Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 06/33] media: atmel: atmel-isc: extract CSC submodule config into separate function Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 07/33] media: atmel: atmel-isc-base: add id to clock debug message Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 08/33] media: atmel: atmel-isc: create register offsets struct Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 09/33] media: atmel: atmel-isc: extract CBC submodule config into separate function Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 10/33] media: atmel: atmel-isc: add CBC to the reg offsets struct Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 11/33] media: atmel: atmel-isc: add SUB422 and SUB420 to register offsets Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 12/33] media: atmel: atmel-isc: add RLP " Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 13/33] media: atmel: atmel-isc: add HIS " Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 14/33] media: atmel: atmel-isc: add DMA " Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 15/33] media: atmel: atmel-isc: add support for version register Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 16/33] media: atmel: atmel-isc: add his_entry to register offsets Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 17/33] media: atmel: atmel-isc: add register description for additional modules Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 18/33] media: atmel: atmel-isc: extend pipeline with extra modules Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 19/33] media: atmel: atmel-isc: add CC initialization function Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 20/33] media: atmel: atmel-isc: create product specific v4l2 controls config Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 21/33] media: atmel: atmel-isc: create callback for DPC submodule product specific Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 22/33] media: atmel: atmel-isc: create callback for GAM " Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 23/33] media: atmel: atmel-isc: create callback for RLP " Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 24/33] media: atmel: atmel-isc: move the formats list into product specific code Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 25/33] media: atmel: atmel-isc: create an adapt pipeline callback for product specific Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 26/33] media: atmel: atmel-isc-regs: add additional fields for sama7g5 type pipeline Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev [this message]
2021-04-13 10:57 ` [PATCH v3 28/33] media: atmel: atmel-isc-sama5d2: remove duplicate define Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 29/33] dt-bindings: media: atmel-isc: convert to yaml Eugen Hristev
2021-04-13 16:32 ` Rob Herring
2021-04-15 8:55 ` [PATCH v4 " Eugen Hristev
2021-04-15 16:16 ` Rob Herring
2021-04-13 10:57 ` [PATCH v3 30/33] dt-bindings: media: add microchip,xisc device bindings Eugen Hristev
2021-04-13 16:34 ` Rob Herring
2021-04-15 8:58 ` [PATCH v4 " Eugen Hristev
2021-04-15 16:40 ` Rob Herring
2021-04-15 18:45 ` [PATCH v5 " Eugen Hristev
2021-04-16 19:06 ` [PATCH v5 30/33] dt-bindings: media: add microchip, xisc " Rob Herring
2021-04-13 10:57 ` [PATCH v3 31/33] media: atmel: atmel-isc: add microchip-xisc driver Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 32/33] MAINTAINERS: update ISC driver bindings file Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 33/33] MAINTAINERS: add xisc files to isc driver entry Eugen Hristev
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=20210413105731.610028-28-eugen.hristev@microchip.com \
--to=eugen.hristev@microchip.com \
--cc=devicetree@vger.kernel.org \
--cc=jacopo@jmondi.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.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).