From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Cc: Benoit Parrot <bparrot@ti.com>, Pratyush Yadav <p.yadav@ti.com>,
Lokesh Vutla <lokeshvutla@ti.com>,
linux-media@vger.kernel.org
Subject: Re: [PATCH 09/28] media: ti-vpe: cal: Add PPI context
Date: Sun, 18 Apr 2021 15:17:56 +0300 [thread overview]
Message-ID: <YHwjdM92XD+Ml5Kq@pendragon.ideasonboard.com> (raw)
In-Reply-To: <20210412113457.328012-10-tomi.valkeinen@ideasonboard.com>
Hi Tomi,
Thank you for the patch.
On Mon, Apr 12, 2021 at 02:34:38PM +0300, Tomi Valkeinen wrote:
> CAL has 8 PPI contexts per PHY, which are used to tag the incoming data.
> The current driver only uses the first PPI, but we need to support all
> of them to implement multi-stream support.
>
> Add a ppi_ctx field to cal_ctx, which indicates which of the 8 PPI
> contexts is used for the particular cal_ctx. Also clean up the PPI
> context register macros to take the PPI context number as a parameter.
As far as I can tell, the TRMs don't mention "PPI contexts". PPI stands
for PHY Protocol Interface, it does identify a particular physical
interface. Would it be better to rename ppi_ctx to csi2_ctx ? This
would match the register names too.
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
> ---
> drivers/media/platform/ti-vpe/cal.c | 10 ++++++----
> drivers/media/platform/ti-vpe/cal.h | 1 +
> drivers/media/platform/ti-vpe/cal_regs.h | 18 ++----------------
> 3 files changed, 9 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
> index 3d57aedbee0a..c550eeb27e79 100644
> --- a/drivers/media/platform/ti-vpe/cal.c
> +++ b/drivers/media/platform/ti-vpe/cal.c
> @@ -294,7 +294,7 @@ static void cal_ctx_csi2_config(struct cal_ctx *ctx)
> {
> u32 val;
>
> - val = cal_read(ctx->cal, CAL_CSI2_CTX0(ctx->index));
> + val = cal_read(ctx->cal, CAL_CSI2_CTX(ctx->phy->instance, ctx->ppi_ctx));
> cal_set_field(&val, ctx->cport, CAL_CSI2_CTX_CPORT_MASK);
> /*
> * DT type: MIPI CSI-2 Specs
> @@ -310,9 +310,10 @@ static void cal_ctx_csi2_config(struct cal_ctx *ctx)
> cal_set_field(&val, CAL_CSI2_CTX_ATT_PIX, CAL_CSI2_CTX_ATT_MASK);
> cal_set_field(&val, CAL_CSI2_CTX_PACK_MODE_LINE,
> CAL_CSI2_CTX_PACK_MODE_MASK);
> - cal_write(ctx->cal, CAL_CSI2_CTX0(ctx->index), val);
> - ctx_dbg(3, ctx, "CAL_CSI2_CTX0(%d) = 0x%08x\n", ctx->index,
> - cal_read(ctx->cal, CAL_CSI2_CTX0(ctx->index)));
> + cal_write(ctx->cal, CAL_CSI2_CTX(ctx->phy->instance, ctx->ppi_ctx), val);
> + ctx_dbg(3, ctx, "CAL_CSI2_CTX%d(%d) = 0x%08x\n",
> + ctx->phy->instance, ctx->ppi_ctx,
> + cal_read(ctx->cal, CAL_CSI2_CTX(ctx->phy->instance, ctx->ppi_ctx)));
> }
>
> static void cal_ctx_pix_proc_config(struct cal_ctx *ctx)
> @@ -854,6 +855,7 @@ static struct cal_ctx *cal_ctx_create(struct cal_dev *cal, int inst)
> ctx->cal = cal;
> ctx->phy = cal->phy[inst];
> ctx->index = inst;
> + ctx->ppi_ctx = inst;
To avoid a functional change in this patch, should this be = 0 ?
> ctx->cport = inst;
>
> ret = cal_ctx_v4l2_init(ctx);
> diff --git a/drivers/media/platform/ti-vpe/cal.h b/drivers/media/platform/ti-vpe/cal.h
> index 251bb0ba7b3b..6eb63268f916 100644
> --- a/drivers/media/platform/ti-vpe/cal.h
> +++ b/drivers/media/platform/ti-vpe/cal.h
> @@ -219,6 +219,7 @@ struct cal_ctx {
> struct vb2_queue vb_vidq;
> u8 index;
> u8 cport;
> + u8 ppi_ctx;
> };
>
> extern unsigned int cal_debug;
> diff --git a/drivers/media/platform/ti-vpe/cal_regs.h b/drivers/media/platform/ti-vpe/cal_regs.h
> index f752096dcf7f..5c4f9e642185 100644
> --- a/drivers/media/platform/ti-vpe/cal_regs.h
> +++ b/drivers/media/platform/ti-vpe/cal_regs.h
> @@ -72,22 +72,8 @@
> #define CAL_CSI2_TIMING(m) (0x314U + (m) * 0x80U)
> #define CAL_CSI2_VC_IRQENABLE(m) (0x318U + (m) * 0x80U)
> #define CAL_CSI2_VC_IRQSTATUS(m) (0x328U + (m) * 0x80U)
> -#define CAL_CSI2_CTX0(m) (0x330U + (m) * 0x80U)
> -#define CAL_CSI2_CTX1(m) (0x334U + (m) * 0x80U)
> -#define CAL_CSI2_CTX2(m) (0x338U + (m) * 0x80U)
> -#define CAL_CSI2_CTX3(m) (0x33cU + (m) * 0x80U)
> -#define CAL_CSI2_CTX4(m) (0x340U + (m) * 0x80U)
> -#define CAL_CSI2_CTX5(m) (0x344U + (m) * 0x80U)
> -#define CAL_CSI2_CTX6(m) (0x348U + (m) * 0x80U)
> -#define CAL_CSI2_CTX7(m) (0x34cU + (m) * 0x80U)
> -#define CAL_CSI2_STATUS0(m) (0x350U + (m) * 0x80U)
> -#define CAL_CSI2_STATUS1(m) (0x354U + (m) * 0x80U)
> -#define CAL_CSI2_STATUS2(m) (0x358U + (m) * 0x80U)
> -#define CAL_CSI2_STATUS3(m) (0x35cU + (m) * 0x80U)
> -#define CAL_CSI2_STATUS4(m) (0x360U + (m) * 0x80U)
> -#define CAL_CSI2_STATUS5(m) (0x364U + (m) * 0x80U)
> -#define CAL_CSI2_STATUS6(m) (0x368U + (m) * 0x80U)
> -#define CAL_CSI2_STATUS7(m) (0x36cU + (m) * 0x80U)
> +#define CAL_CSI2_CTX(phy, ppi_ctx) (0x330U + (phy) * 0x80U + (ppi_ctx) * 4)
> +#define CAL_CSI2_STATUS(phy, ppi_ctx) (0x350U + (phy) * 0x80U + (ppi_ctx) * 4)
>
> /* CAL CSI2 PHY register offsets */
> #define CAL_CSI2_PHY_REG0 0x000
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2021-04-18 12:18 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-12 11:34 [PATCH 00/28] media: ti-vpe: cal: prepare for multistream support Tomi Valkeinen
2021-04-12 11:34 ` [PATCH 01/28] media: ti-vpe: cal: add g/s_parm for legacy API Tomi Valkeinen
2021-04-17 23:01 ` Laurent Pinchart
2021-04-12 11:34 ` [PATCH 02/28] media: ti-vpe: cal: fix error handling in cal_camerarx_create Tomi Valkeinen
2021-04-17 23:05 ` Laurent Pinchart
2021-04-19 8:24 ` Tomi Valkeinen
2021-04-19 8:31 ` Laurent Pinchart
2021-04-12 11:34 ` [PATCH 03/28] media: ti-vpe: cal: remove unused cal_camerarx->dev field Tomi Valkeinen
2021-04-18 0:43 ` Laurent Pinchart
2021-04-12 11:34 ` [PATCH 04/28] media: ti-vpe: cal: rename "sensor" to "source" Tomi Valkeinen
2021-04-17 23:18 ` Laurent Pinchart
2021-04-12 11:34 ` [PATCH 05/28] media: ti-vpe: cal: move global config from cal_ctx_wr_dma_config to runtime resume Tomi Valkeinen
2021-04-17 23:27 ` Laurent Pinchart
2021-04-12 11:34 ` [PATCH 06/28] media: ti-vpe: cal: use v4l2_get_link_freq Tomi Valkeinen
2021-04-18 11:48 ` Laurent Pinchart
2021-04-12 11:34 ` [PATCH 07/28] media: ti-vpe: cal: add cal_ctx_prepare/unprepare Tomi Valkeinen
2021-04-18 13:30 ` Laurent Pinchart
2021-04-12 11:34 ` [PATCH 08/28] media: ti-vpe: cal: change index and cport to u8 Tomi Valkeinen
2021-04-18 11:55 ` Laurent Pinchart
2021-04-12 11:34 ` [PATCH 09/28] media: ti-vpe: cal: Add PPI context Tomi Valkeinen
2021-04-18 12:17 ` Laurent Pinchart [this message]
2021-04-19 9:01 ` Tomi Valkeinen
2021-04-12 11:34 ` [PATCH 10/28] media: ti-vpe: cal: Add pixel processing context Tomi Valkeinen
2021-04-18 12:20 ` Laurent Pinchart
2021-04-18 12:23 ` Laurent Pinchart
2021-04-19 9:17 ` Tomi Valkeinen
2021-04-12 11:34 ` [PATCH 11/28] media: ti-vpe: cal: rename cal_ctx->index to dma_ctx Tomi Valkeinen
2021-04-18 12:22 ` Laurent Pinchart
2021-04-12 11:34 ` [PATCH 12/28] media: ti-vpe: cal: rename CAL_HL_IRQ_MASK Tomi Valkeinen
2021-04-18 12:29 ` Laurent Pinchart
2021-04-12 11:34 ` [PATCH 13/28] media: ti-vpe: cal: clean up CAL_CSI2_VC_IRQ_* macros Tomi Valkeinen
2021-04-18 12:32 ` Laurent Pinchart
2021-04-19 10:29 ` Tomi Valkeinen
2021-04-12 11:34 ` [PATCH 14/28] media: ti-vpe: cal: catch VC errors Tomi Valkeinen
2021-04-18 12:38 ` Laurent Pinchart
2021-04-19 11:19 ` Tomi Valkeinen
2021-04-28 23:44 ` Laurent Pinchart
2021-04-12 11:34 ` [PATCH 15/28] media: ti-vpe: cal: remove wait when stopping camerarx Tomi Valkeinen
2021-04-18 12:46 ` Laurent Pinchart
2021-04-19 11:29 ` Tomi Valkeinen
2021-04-28 23:57 ` Laurent Pinchart
2021-05-04 7:56 ` Tomi Valkeinen
2021-06-04 13:44 ` Laurent Pinchart
2021-06-07 10:41 ` Tomi Valkeinen
2021-06-09 12:31 ` Laurent Pinchart
2021-04-12 11:34 ` [PATCH 16/28] media: ti-vpe: cal: disable ppi and pix proc at ctx_stop Tomi Valkeinen
2021-04-18 12:49 ` Laurent Pinchart
2021-04-12 11:34 ` [PATCH 17/28] media: ti-vpe: cal: allocate pix proc dynamically Tomi Valkeinen
2021-04-18 12:59 ` Laurent Pinchart
2021-04-19 11:45 ` Tomi Valkeinen
2021-04-29 0:04 ` Laurent Pinchart
2021-04-12 11:34 ` [PATCH 18/28] media: ti-vpe: cal: add 'use_pix_proc' field Tomi Valkeinen
2021-04-18 13:00 ` Laurent Pinchart
2021-04-19 11:53 ` Tomi Valkeinen
2021-04-29 0:07 ` Laurent Pinchart
2021-04-12 11:34 ` [PATCH 19/28] media: ti-vpe: cal: add cal_ctx_wr_dma_enable and fix a race Tomi Valkeinen
2021-04-18 13:04 ` Laurent Pinchart
2021-04-19 12:02 ` Tomi Valkeinen
2021-04-12 11:34 ` [PATCH 20/28] media: ti-vpe: cal: add vc and datatype fields to cal_ctx Tomi Valkeinen
2021-04-18 13:06 ` Laurent Pinchart
2021-04-19 12:07 ` Tomi Valkeinen
2021-04-12 11:34 ` [PATCH 21/28] media: ti-vpe: cal: fix cal_ctx_v4l2_register error handling Tomi Valkeinen
2021-04-18 13:09 ` Laurent Pinchart
2021-04-20 10:50 ` Tomi Valkeinen
2021-04-20 11:17 ` Tomi Valkeinen
2021-04-29 0:10 ` Laurent Pinchart
2021-04-12 11:34 ` [PATCH 22/28] media: ti-vpe: cal: set field always to V4L2_FIELD_NONE Tomi Valkeinen
2021-04-18 13:14 ` Laurent Pinchart
2021-04-19 12:34 ` Tomi Valkeinen
2021-04-12 11:34 ` [PATCH 23/28] media: ti-vpe: cal: fix typo in a comment Tomi Valkeinen
2021-04-18 13:14 ` Laurent Pinchart
2021-04-12 11:34 ` [PATCH 24/28] media: ti-vpe: cal: add mbus_code support to cal_mc_enum_fmt_vid_cap Tomi Valkeinen
2021-04-18 13:17 ` Laurent Pinchart
2021-04-19 12:50 ` Tomi Valkeinen
2021-04-12 11:34 ` [PATCH 25/28] media: ti-vpe: cal: rename non-MC funcs to cal_legacy_* Tomi Valkeinen
2021-04-18 13:18 ` Laurent Pinchart
2021-04-12 11:34 ` [PATCH 26/28] media: ti-vpe: cal: init ctx->v_fmt correctly in MC mode Tomi Valkeinen
2021-04-18 13:21 ` Laurent Pinchart
2021-04-19 13:01 ` Tomi Valkeinen
2021-04-12 11:34 ` [PATCH 27/28] media: ti-vpe: cal: remove cal_camerarx->fmtinfo Tomi Valkeinen
2021-04-18 13:24 ` Laurent Pinchart
2021-04-19 13:08 ` Tomi Valkeinen
2021-04-12 11:34 ` [PATCH 28/28] media: ti-vpe: cal: support 8 DMA contexts Tomi Valkeinen
2021-04-18 13:29 ` 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=YHwjdM92XD+Ml5Kq@pendragon.ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=bparrot@ti.com \
--cc=linux-media@vger.kernel.org \
--cc=lokeshvutla@ti.com \
--cc=p.yadav@ti.com \
--cc=tomi.valkeinen@ideasonboard.com \
/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).