From: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
To: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Cc: linux-media@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org,
linux-staging@lists.linux.dev,
Benjamin Gaignard <benjamin.gaignard@collabora.com>,
Boris Brezillon <boris.brezillon@collabora.com>,
Fabio Estevam <festevam@gmail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Heiko Stuebner <heiko@sntech.de>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Nicolas Dufresne <nicolas.dufresne@collabora.com>,
NXP Linux Team <linux-imx@nxp.com>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Philipp Zabel <p.zabel@pengutronix.de>,
Sascha Hauer <s.hauer@pengutronix.de>,
Shawn Guo <shawnguo@kernel.org>,
kernel@collabora.com
Subject: Re: [PATCH v8 08/12] media: hantro: Rename registers
Date: Wed, 17 Nov 2021 08:02:39 -0300 [thread overview]
Message-ID: <YZThT9kRyoGu2IkU@eze-laptop> (raw)
In-Reply-To: <20211116143842.75896-9-andrzej.p@collabora.com>
On Tue, Nov 16, 2021 at 03:38:38PM +0100, Andrzej Pietrasiewicz wrote:
> Add more consistency in the way registers are named.
>
> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Reviewed-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
> ---
> .../staging/media/hantro/hantro_g2_hevc_dec.c | 40 +++++++++----------
> drivers/staging/media/hantro/hantro_g2_regs.h | 28 ++++++-------
> 2 files changed, 34 insertions(+), 34 deletions(-)
>
> diff --git a/drivers/staging/media/hantro/hantro_g2_hevc_dec.c b/drivers/staging/media/hantro/hantro_g2_hevc_dec.c
> index 76a921163b9a..abae36f9b418 100644
> --- a/drivers/staging/media/hantro/hantro_g2_hevc_dec.c
> +++ b/drivers/staging/media/hantro/hantro_g2_hevc_dec.c
> @@ -448,9 +448,9 @@ static int set_ref(struct hantro_ctx *ctx)
> if (dpb[i].rps == V4L2_HEVC_DPB_ENTRY_RPS_LT_CURR)
> dpb_longterm_e |= BIT(V4L2_HEVC_DPB_ENTRIES_NUM_MAX - 1 - i);
>
> - hantro_write_addr(vpu, G2_REG_ADDR_REF(i), luma_addr);
> - hantro_write_addr(vpu, G2_REG_CHR_REF(i), chroma_addr);
> - hantro_write_addr(vpu, G2_REG_DMV_REF(i), mv_addr);
> + hantro_write_addr(vpu, G2_REF_LUMA_ADDR(i), luma_addr);
> + hantro_write_addr(vpu, G2_REF_CHROMA_ADDR(i), chroma_addr);
> + hantro_write_addr(vpu, G2_REF_MV_ADDR(i), mv_addr);
> }
>
> luma_addr = hantro_hevc_get_ref_buf(ctx, decode_params->pic_order_cnt_val);
> @@ -460,20 +460,20 @@ static int set_ref(struct hantro_ctx *ctx)
> chroma_addr = luma_addr + cr_offset;
> mv_addr = luma_addr + mv_offset;
>
> - hantro_write_addr(vpu, G2_REG_ADDR_REF(i), luma_addr);
> - hantro_write_addr(vpu, G2_REG_CHR_REF(i), chroma_addr);
> - hantro_write_addr(vpu, G2_REG_DMV_REF(i++), mv_addr);
> + hantro_write_addr(vpu, G2_REF_LUMA_ADDR(i), luma_addr);
> + hantro_write_addr(vpu, G2_REF_CHROMA_ADDR(i), chroma_addr);
> + hantro_write_addr(vpu, G2_REF_MV_ADDR(i++), mv_addr);
>
> - hantro_write_addr(vpu, G2_ADDR_DST, luma_addr);
> - hantro_write_addr(vpu, G2_ADDR_DST_CHR, chroma_addr);
> - hantro_write_addr(vpu, G2_ADDR_DST_MV, mv_addr);
> + hantro_write_addr(vpu, G2_OUT_LUMA_ADDR, luma_addr);
> + hantro_write_addr(vpu, G2_OUT_CHROMA_ADDR, chroma_addr);
> + hantro_write_addr(vpu, G2_OUT_MV_ADDR, mv_addr);
>
> hantro_hevc_ref_remove_unused(ctx);
>
> for (; i < V4L2_HEVC_DPB_ENTRIES_NUM_MAX; i++) {
> - hantro_write_addr(vpu, G2_REG_ADDR_REF(i), 0);
> - hantro_write_addr(vpu, G2_REG_CHR_REF(i), 0);
> - hantro_write_addr(vpu, G2_REG_DMV_REF(i), 0);
> + hantro_write_addr(vpu, G2_REF_LUMA_ADDR(i), 0);
> + hantro_write_addr(vpu, G2_REF_CHROMA_ADDR(i), 0);
> + hantro_write_addr(vpu, G2_REF_MV_ADDR(i), 0);
> }
>
> hantro_reg_write(vpu, &g2_refer_lterm_e, dpb_longterm_e);
> @@ -499,7 +499,7 @@ static void set_buffers(struct hantro_ctx *ctx)
> src_len = vb2_get_plane_payload(&src_buf->vb2_buf, 0);
> src_buf_len = vb2_plane_size(&src_buf->vb2_buf, 0);
>
> - hantro_write_addr(vpu, G2_ADDR_STR, src_dma);
> + hantro_write_addr(vpu, G2_STREAM_ADDR, src_dma);
> hantro_reg_write(vpu, &g2_stream_len, src_len);
> hantro_reg_write(vpu, &g2_strm_buffer_len, src_buf_len);
> hantro_reg_write(vpu, &g2_strm_start_offset, 0);
> @@ -508,12 +508,12 @@ static void set_buffers(struct hantro_ctx *ctx)
> /* Destination (decoded frame) buffer. */
> dst_dma = hantro_get_dec_buf_addr(ctx, &dst_buf->vb2_buf);
>
> - hantro_write_addr(vpu, G2_RASTER_SCAN, dst_dma);
> - hantro_write_addr(vpu, G2_RASTER_SCAN_CHR, dst_dma + cr_offset);
> - hantro_write_addr(vpu, G2_ADDR_TILE_SIZE, ctx->hevc_dec.tile_sizes.dma);
> - hantro_write_addr(vpu, G2_TILE_FILTER, ctx->hevc_dec.tile_filter.dma);
> - hantro_write_addr(vpu, G2_TILE_SAO, ctx->hevc_dec.tile_sao.dma);
> - hantro_write_addr(vpu, G2_TILE_BSD, ctx->hevc_dec.tile_bsd.dma);
> + hantro_write_addr(vpu, G2_RS_OUT_LUMA_ADDR, dst_dma);
> + hantro_write_addr(vpu, G2_RS_OUT_CHROMA_ADDR, dst_dma + cr_offset);
> + hantro_write_addr(vpu, G2_TILE_SIZES_ADDR, ctx->hevc_dec.tile_sizes.dma);
> + hantro_write_addr(vpu, G2_TILE_FILTER_ADDR, ctx->hevc_dec.tile_filter.dma);
> + hantro_write_addr(vpu, G2_TILE_SAO_ADDR, ctx->hevc_dec.tile_sao.dma);
> + hantro_write_addr(vpu, G2_TILE_BSD_ADDR, ctx->hevc_dec.tile_bsd.dma);
> }
>
> static void prepare_scaling_list_buffer(struct hantro_ctx *ctx)
> @@ -563,7 +563,7 @@ static void prepare_scaling_list_buffer(struct hantro_ctx *ctx)
> for (k = 0; k < 8; k++)
> *p++ = sc->scaling_list_32x32[i][8 * k + j];
>
> - hantro_write_addr(vpu, HEVC_SCALING_LIST, ctx->hevc_dec.scaling_lists.dma);
> + hantro_write_addr(vpu, G2_HEVC_SCALING_LIST_ADDR, ctx->hevc_dec.scaling_lists.dma);
> }
>
> static void hantro_g2_check_idle(struct hantro_dev *vpu)
> diff --git a/drivers/staging/media/hantro/hantro_g2_regs.h b/drivers/staging/media/hantro/hantro_g2_regs.h
> index bb22fa921914..24b18f839ff8 100644
> --- a/drivers/staging/media/hantro/hantro_g2_regs.h
> +++ b/drivers/staging/media/hantro/hantro_g2_regs.h
> @@ -177,20 +177,20 @@
> #define G2_REG_CONFIG_DEC_CLK_GATE_E BIT(16)
> #define G2_REG_CONFIG_DEC_CLK_GATE_IDLE_E BIT(17)
>
> -#define G2_ADDR_DST (G2_SWREG(65))
> -#define G2_REG_ADDR_REF(i) (G2_SWREG(67) + ((i) * 0x8))
> -#define G2_ADDR_DST_CHR (G2_SWREG(99))
> -#define G2_REG_CHR_REF(i) (G2_SWREG(101) + ((i) * 0x8))
> -#define G2_ADDR_DST_MV (G2_SWREG(133))
> -#define G2_REG_DMV_REF(i) (G2_SWREG(135) + ((i) * 0x8))
> -#define G2_ADDR_TILE_SIZE (G2_SWREG(167))
> -#define G2_ADDR_STR (G2_SWREG(169))
> -#define HEVC_SCALING_LIST (G2_SWREG(171))
> -#define G2_RASTER_SCAN (G2_SWREG(175))
> -#define G2_RASTER_SCAN_CHR (G2_SWREG(177))
> -#define G2_TILE_FILTER (G2_SWREG(179))
> -#define G2_TILE_SAO (G2_SWREG(181))
> -#define G2_TILE_BSD (G2_SWREG(183))
> +#define G2_OUT_LUMA_ADDR (G2_SWREG(65))
> +#define G2_REF_LUMA_ADDR(i) (G2_SWREG(67) + ((i) * 0x8))
> +#define G2_OUT_CHROMA_ADDR (G2_SWREG(99))
> +#define G2_REF_CHROMA_ADDR(i) (G2_SWREG(101) + ((i) * 0x8))
> +#define G2_OUT_MV_ADDR (G2_SWREG(133))
> +#define G2_REF_MV_ADDR(i) (G2_SWREG(135) + ((i) * 0x8))
> +#define G2_TILE_SIZES_ADDR (G2_SWREG(167))
> +#define G2_STREAM_ADDR (G2_SWREG(169))
> +#define G2_HEVC_SCALING_LIST_ADDR (G2_SWREG(171))
> +#define G2_RS_OUT_LUMA_ADDR (G2_SWREG(175))
> +#define G2_RS_OUT_CHROMA_ADDR (G2_SWREG(177))
> +#define G2_TILE_FILTER_ADDR (G2_SWREG(179))
> +#define G2_TILE_SAO_ADDR (G2_SWREG(181))
> +#define G2_TILE_BSD_ADDR (G2_SWREG(183))
>
> #define g2_strm_buffer_len G2_DEC_REG(258, 0, 0xffffffff)
> #define g2_strm_start_offset G2_DEC_REG(259, 0, 0xffffffff)
> --
> 2.25.1
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2021-11-17 11:03 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-16 14:38 [PATCH v8 00/12] VP9 codec V4L2 control interface Andrzej Pietrasiewicz
2021-11-16 14:38 ` [PATCH v8 01/12] hantro: postproc: Fix motion vector space size Andrzej Pietrasiewicz
2021-11-16 14:38 ` [PATCH v8 02/12] hantro: postproc: Introduce struct hantro_postproc_ops Andrzej Pietrasiewicz
2021-11-16 14:38 ` [PATCH v8 03/12] hantro: Simplify postprocessor Andrzej Pietrasiewicz
2021-11-16 14:38 ` [PATCH v8 04/12] hantro: Add quirk for NV12/NV12_4L4 capture format Andrzej Pietrasiewicz
2021-11-16 14:38 ` [PATCH v8 05/12] media: uapi: Add VP9 stateless decoder controls Andrzej Pietrasiewicz
2021-11-16 14:38 ` [PATCH v8 06/12] media: Add VP9 v4l2 library Andrzej Pietrasiewicz
2021-11-16 14:38 ` [PATCH v8 07/12] media: rkvdec: Add the VP9 backend Andrzej Pietrasiewicz
2021-11-17 11:52 ` [PATCH v8.1 " Andrzej Pietrasiewicz
2021-11-16 14:38 ` [PATCH v8 08/12] media: hantro: Rename registers Andrzej Pietrasiewicz
2021-11-17 11:02 ` Ezequiel Garcia [this message]
2021-11-16 14:38 ` [PATCH v8 09/12] media: hantro: Prepare for other G2 codecs Andrzej Pietrasiewicz
2021-11-16 14:38 ` [PATCH v8 10/12] media: hantro: Support VP9 on the G2 core Andrzej Pietrasiewicz
2021-11-16 14:38 ` [PATCH v8 11/12] media: hantro: Staticize a struct in postprocessor code Andrzej Pietrasiewicz
2021-11-17 11:01 ` Ezequiel Garcia
2021-11-16 14:38 ` [PATCH v8 12/12] media: hantro: Support NV12 on the G2 core Andrzej Pietrasiewicz
2021-11-16 14:47 ` [PATCH v8 00/12] VP9 codec V4L2 control interface Ezequiel Garcia
2021-11-16 14:48 ` Andrzej Pietrasiewicz
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=YZThT9kRyoGu2IkU@eze-laptop \
--to=ezequiel@vanguardiasur.com.ar \
--cc=andrzej.p@collabora.com \
--cc=benjamin.gaignard@collabora.com \
--cc=boris.brezillon@collabora.com \
--cc=festevam@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=heiko@sntech.de \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jernej.skrabec@gmail.com \
--cc=kernel@collabora.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-staging@lists.linux.dev \
--cc=mchehab@kernel.org \
--cc=nicolas.dufresne@collabora.com \
--cc=p.zabel@pengutronix.de \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@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