Hi Tomi,
Thank you for the patch.
On Mon, Apr 12, 2021 at 02:34:40PM +0300, Tomi Valkeinen wrote:
> Rename cal_ctx->index to dma_ctx to clarify that the field refers to the
> DMA context number.
>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@xxxxxxxxxxxxxxxx>
Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
> drivers/media/platform/ti-vpe/cal-video.c | 4 +--
> drivers/media/platform/ti-vpe/cal.c | 38 +++++++++++------------
> drivers/media/platform/ti-vpe/cal.h | 8 ++---
> 3 files changed, 25 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/media/platform/ti-vpe/cal-video.c b/drivers/media/platform/ti-vpe/cal-video.c
> index 8e9bbe6beb23..064efdc31b28 100644
> --- a/drivers/media/platform/ti-vpe/cal-video.c
> +++ b/drivers/media/platform/ti-vpe/cal-video.c
> @@ -897,7 +897,7 @@ int cal_ctx_v4l2_register(struct cal_ctx *ctx)
> MEDIA_LNK_FL_ENABLED);
> if (ret) {
> ctx_err(ctx, "Failed to create media link for context %u\n",
> - ctx->index);
> + ctx->dma_ctx);
> video_unregister_device(vfd);
> return ret;
> }
> @@ -949,7 +949,7 @@ int cal_ctx_v4l2_init(struct cal_ctx *ctx)
> | (cal_mc_api ? V4L2_CAP_IO_MC : 0);
> vfd->v4l2_dev = &ctx->cal->v4l2_dev;
> vfd->queue = q;
> - snprintf(vfd->name, sizeof(vfd->name), "CAL output %u", ctx->index);
> + snprintf(vfd->name, sizeof(vfd->name), "CAL output %u", ctx->dma_ctx);
> vfd->release = video_device_release_empty;
> vfd->ioctl_ops = cal_mc_api ? &cal_ioctl_mc_ops : &cal_ioctl_video_ops;
> vfd->lock = &ctx->mutex;
> diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
> index 3dc83c66fd96..daa0c1ab94e7 100644
> --- a/drivers/media/platform/ti-vpe/cal.c
> +++ b/drivers/media/platform/ti-vpe/cal.c
> @@ -372,7 +372,7 @@ static void cal_ctx_wr_dma_config(struct cal_ctx *ctx)
> unsigned int stride = ctx->v_fmt.fmt.pix.bytesperline;
> u32 val;
>
> - val = cal_read(ctx->cal, CAL_WR_DMA_CTRL(ctx->index));
> + val = cal_read(ctx->cal, CAL_WR_DMA_CTRL(ctx->dma_ctx));
> cal_set_field(&val, ctx->cport, CAL_WR_DMA_CTRL_CPORT_MASK);
> cal_set_field(&val, ctx->v_fmt.fmt.pix.height,
> CAL_WR_DMA_CTRL_YSIZE_MASK);
> @@ -383,16 +383,16 @@ static void cal_ctx_wr_dma_config(struct cal_ctx *ctx)
> cal_set_field(&val, CAL_WR_DMA_CTRL_PATTERN_LINEAR,
> CAL_WR_DMA_CTRL_PATTERN_MASK);
> cal_set_field(&val, 1, CAL_WR_DMA_CTRL_STALL_RD_MASK);
> - cal_write(ctx->cal, CAL_WR_DMA_CTRL(ctx->index), val);
> - ctx_dbg(3, ctx, "CAL_WR_DMA_CTRL(%d) = 0x%08x\n", ctx->index,
> - cal_read(ctx->cal, CAL_WR_DMA_CTRL(ctx->index)));
> + cal_write(ctx->cal, CAL_WR_DMA_CTRL(ctx->dma_ctx), val);
> + ctx_dbg(3, ctx, "CAL_WR_DMA_CTRL(%d) = 0x%08x\n", ctx->dma_ctx,
> + cal_read(ctx->cal, CAL_WR_DMA_CTRL(ctx->dma_ctx)));
>
> - cal_write_field(ctx->cal, CAL_WR_DMA_OFST(ctx->index),
> + cal_write_field(ctx->cal, CAL_WR_DMA_OFST(ctx->dma_ctx),
> stride / 16, CAL_WR_DMA_OFST_MASK);
> - ctx_dbg(3, ctx, "CAL_WR_DMA_OFST(%d) = 0x%08x\n", ctx->index,
> - cal_read(ctx->cal, CAL_WR_DMA_OFST(ctx->index)));
> + ctx_dbg(3, ctx, "CAL_WR_DMA_OFST(%d) = 0x%08x\n", ctx->dma_ctx,
> + cal_read(ctx->cal, CAL_WR_DMA_OFST(ctx->dma_ctx)));
>
> - val = cal_read(ctx->cal, CAL_WR_DMA_XSIZE(ctx->index));
> + val = cal_read(ctx->cal, CAL_WR_DMA_XSIZE(ctx->dma_ctx));
> /* 64 bit word means no skipping */
> cal_set_field(&val, 0, CAL_WR_DMA_XSIZE_XSKIP_MASK);
> /*
> @@ -401,23 +401,23 @@ static void cal_ctx_wr_dma_config(struct cal_ctx *ctx)
> * written per line.
> */
> cal_set_field(&val, stride / 8, CAL_WR_DMA_XSIZE_MASK);
> - cal_write(ctx->cal, CAL_WR_DMA_XSIZE(ctx->index), val);
> - ctx_dbg(3, ctx, "CAL_WR_DMA_XSIZE(%d) = 0x%08x\n", ctx->index,
> - cal_read(ctx->cal, CAL_WR_DMA_XSIZE(ctx->index)));
> + cal_write(ctx->cal, CAL_WR_DMA_XSIZE(ctx->dma_ctx), val);
> + ctx_dbg(3, ctx, "CAL_WR_DMA_XSIZE(%d) = 0x%08x\n", ctx->dma_ctx,
> + cal_read(ctx->cal, CAL_WR_DMA_XSIZE(ctx->dma_ctx)));
> }
>
> void cal_ctx_set_dma_addr(struct cal_ctx *ctx, dma_addr_t addr)
> {
> - cal_write(ctx->cal, CAL_WR_DMA_ADDR(ctx->index), addr);
> + cal_write(ctx->cal, CAL_WR_DMA_ADDR(ctx->dma_ctx), addr);
> }
>
> static void cal_ctx_wr_dma_disable(struct cal_ctx *ctx)
> {
> - u32 val = cal_read(ctx->cal, CAL_WR_DMA_CTRL(ctx->index));
> + u32 val = cal_read(ctx->cal, CAL_WR_DMA_CTRL(ctx->dma_ctx));
>
> cal_set_field(&val, CAL_WR_DMA_CTRL_MODE_DIS,
> CAL_WR_DMA_CTRL_MODE_MASK);
> - cal_write(ctx->cal, CAL_WR_DMA_CTRL(ctx->index), val);
> + cal_write(ctx->cal, CAL_WR_DMA_CTRL(ctx->dma_ctx), val);
> }
>
> static bool cal_ctx_wr_dma_stopped(struct cal_ctx *ctx)
> @@ -453,9 +453,9 @@ void cal_ctx_start(struct cal_ctx *ctx)
>
> /* Enable IRQ_WDMA_END and IRQ_WDMA_START. */
> cal_write(ctx->cal, CAL_HL_IRQENABLE_SET(1),
> - CAL_HL_IRQ_MASK(ctx->index));
> + CAL_HL_IRQ_MASK(ctx->dma_ctx));
> cal_write(ctx->cal, CAL_HL_IRQENABLE_SET(2),
> - CAL_HL_IRQ_MASK(ctx->index));
> + CAL_HL_IRQ_MASK(ctx->dma_ctx));
> }
>
> void cal_ctx_stop(struct cal_ctx *ctx)
> @@ -479,9 +479,9 @@ void cal_ctx_stop(struct cal_ctx *ctx)
>
> /* Disable IRQ_WDMA_END and IRQ_WDMA_START. */
> cal_write(ctx->cal, CAL_HL_IRQENABLE_CLR(1),
> - CAL_HL_IRQ_MASK(ctx->index));
> + CAL_HL_IRQ_MASK(ctx->dma_ctx));
> cal_write(ctx->cal, CAL_HL_IRQENABLE_CLR(2),
> - CAL_HL_IRQ_MASK(ctx->index));
> + CAL_HL_IRQ_MASK(ctx->dma_ctx));
>
> ctx->dma.state = CAL_DMA_STOPPED;
> }
> @@ -854,7 +854,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->dma_ctx = inst;
> ctx->ppi_ctx = inst;
> ctx->cport = inst;
> ctx->pix_proc = inst;
> diff --git a/drivers/media/platform/ti-vpe/cal.h b/drivers/media/platform/ti-vpe/cal.h
> index 03c71763f1a5..c34b843d2019 100644
> --- a/drivers/media/platform/ti-vpe/cal.h
> +++ b/drivers/media/platform/ti-vpe/cal.h
> @@ -217,7 +217,7 @@ struct cal_ctx {
>
> unsigned int sequence;
> struct vb2_queue vb_vidq;
> - u8 index;
> + u8 dma_ctx;
> u8 cport;
> u8 ppi_ctx;
> u8 pix_proc;
> @@ -238,11 +238,11 @@ extern bool cal_mc_api;
> dev_err((cal)->dev, fmt, ##arg)
>
> #define ctx_dbg(level, ctx, fmt, arg...) \
> - cal_dbg(level, (ctx)->cal, "ctx%u: " fmt, (ctx)->index, ##arg)
> + cal_dbg(level, (ctx)->cal, "ctx%u: " fmt, (ctx)->dma_ctx, ##arg)
> #define ctx_info(ctx, fmt, arg...) \
> - cal_info((ctx)->cal, "ctx%u: " fmt, (ctx)->index, ##arg)
> + cal_info((ctx)->cal, "ctx%u: " fmt, (ctx)->dma_ctx, ##arg)
> #define ctx_err(ctx, fmt, arg...) \
> - cal_err((ctx)->cal, "ctx%u: " fmt, (ctx)->index, ##arg)
> + cal_err((ctx)->cal, "ctx%u: " fmt, (ctx)->dma_ctx, ##arg)
>
> #define phy_dbg(level, phy, fmt, arg...) \
> cal_dbg(level, (phy)->cal, "phy%u: " fmt, (phy)->instance, ##arg)
--
Regards,
Laurent Pinchart
