From: "Alim Akhtar" <alim.akhtar@samsung.com>
To: "'Aakarsh Jain'" <aakarsh.jain@samsung.com>,
<linux-arm-kernel@lists.infradead.org>,
<linux-media@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<devicetree@vger.kernel.org>
Cc: <m.szyprowski@samsung.com>, <andrzej.hajda@intel.com>,
<mchehab@kernel.org>, <hverkuil-cisco@xs4all.nl>,
<krzysztof.kozlowski+dt@linaro.org>, <dillon.minfei@gmail.com>,
<david.plowman@raspberrypi.com>, <mark.rutland@arm.com>,
<robh+dt@kernel.org>, <conor+dt@kernel.org>,
<linux-samsung-soc@vger.kernel.org>, <andi@etezian.org>,
<gost.dev@samsung.com>, <aswani.reddy@samsung.com>,
<pankaj.dubey@samsung.com>, <ajaykumar.rs@samsung.com>,
<linux-fsd@tesla.com>,
"'Smitha T Murthy'" <smithatmurthy@gmail.com>
Subject: RE: [Patch v4 02/11] media: s5p-mfc: Rename IS_MFCV10 macro
Date: Thu, 16 Nov 2023 10:30:00 +0530 [thread overview]
Message-ID: <0d2801da1849$c34ddc70$49e99550$@samsung.com> (raw)
In-Reply-To: <20231025102216.50480-3-aakarsh.jain@samsung.com>
Hi Aakarsh
> -----Original Message-----
> From: Aakarsh Jain <aakarsh.jain@samsung.com>
> Sent: Wednesday, October 25, 2023 3:52 PM
> To: linux-arm-kernel@lists.infradead.org; linux-media@vger.kernel.org;
> linux-kernel@vger.kernel.org; devicetree@vger.kernel.org
> Cc: m.szyprowski@samsung.com; andrzej.hajda@intel.com;
> mchehab@kernel.org; hverkuil-cisco@xs4all.nl;
> krzysztof.kozlowski+dt@linaro.org; dillon.minfei@gmail.com;
> david.plowman@raspberrypi.com; mark.rutland@arm.com;
> robh+dt@kernel.org; conor+dt@kernel.org; linux-samsung-
> soc@vger.kernel.org; andi@etezian.org; gost.dev@samsung.com;
> alim.akhtar@samsung.com; aswani.reddy@samsung.com;
> pankaj.dubey@samsung.com; ajaykumar.rs@samsung.com;
> aakarsh.jain@samsung.com; linux-fsd@tesla.com; Smitha T Murthy
> <smithatmurthy@gmail.com>
> Subject: [Patch v4 02/11] media: s5p-mfc: Rename IS_MFCV10 macro
>
> Renames macro IS_MFCV10 to IS_MFCV10_PLUS so that the MFCv10 code
> can be resued for MFCv12 support. Since some part of MFCv10 specific code
> holds good for MFCv12 also.
>
> Cc: linux-fsd@tesla.com
> Signed-off-by: Smitha T Murthy <smithatmurthy@gmail.com>
> Signed-off-by: Aakarsh Jain <aakarsh.jain@samsung.com>
> ---
Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
> .../platform/samsung/s5p-mfc/s5p_mfc_common.h | 10 +++----
> .../platform/samsung/s5p-mfc/s5p_mfc_ctrl.c | 2 +-
> .../platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c | 28 +++++++++----------
> 3 files changed, 20 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h
> b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h
> index 5304f42c8c72..e6ec4a43b290 100644
> --- a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h
> +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h
> @@ -771,11 +771,11 @@ void s5p_mfc_cleanup_queue(struct list_head *lh,
> struct vb2_queue *vq);
> #define HAS_PORTNUM(dev) (dev ? (dev->variant ? \
> (dev->variant->port_num ? 1 : 0) : 0) : 0)
> #define IS_TWOPORT(dev) (dev->variant->port_num == 2 ? 1 : 0)
> -#define IS_MFCV6_PLUS(dev) (dev->variant->version >= 0x60 ? 1 :
> 0)
> -#define IS_MFCV7_PLUS(dev) (dev->variant->version >= 0x70 ? 1 :
> 0)
> -#define IS_MFCV8_PLUS(dev) (dev->variant->version >= 0x80 ? 1 :
> 0)
> -#define IS_MFCV10(dev) (dev->variant->version >= 0xA0 ? 1 :
> 0)
> -#define FW_HAS_E_MIN_SCRATCH_BUF(dev) (IS_MFCV10(dev))
> +#define IS_MFCV6_PLUS(dev) (dev->variant->version >= 0x60)
> +#define IS_MFCV7_PLUS(dev) (dev->variant->version >= 0x70)
> +#define IS_MFCV8_PLUS(dev) (dev->variant->version >= 0x80)
> +#define IS_MFCV10_PLUS(dev) (dev->variant->version >= 0xA0)
> +#define FW_HAS_E_MIN_SCRATCH_BUF(dev) (IS_MFCV10_PLUS(dev))
>
> #define MFC_V5_BIT BIT(0)
> #define MFC_V6_BIT BIT(1)
> diff --git a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c
> b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c
> index 6d3c92045c05..54b54b2fa9b1 100644
> --- a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c
> +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c
> @@ -236,7 +236,7 @@ int s5p_mfc_init_hw(struct s5p_mfc_dev *dev)
> else
> mfc_write(dev, 0x3ff, S5P_FIMV_SW_RESET);
>
> - if (IS_MFCV10(dev))
> + if (IS_MFCV10_PLUS(dev))
> mfc_write(dev, 0x0, S5P_FIMV_MFC_CLOCK_OFF_V10);
>
> mfc_debug(2, "Will now wait for completion of firmware
> transfer\n"); diff --git a/drivers/media/platform/samsung/s5p-
> mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/samsung/s5p-
> mfc/s5p_mfc_opr_v6.c
> index c0df5ac9fcff..882166e4ac50 100644
> --- a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c
> +++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c
> @@ -72,9 +72,9 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct
> s5p_mfc_ctx *ctx)
> ctx->luma_size, ctx->chroma_size, ctx->mv_size);
> mfc_debug(2, "Totals bufs: %d\n", ctx->total_dpb_count);
> } else if (ctx->type == MFCINST_ENCODER) {
> - if (IS_MFCV10(dev)) {
> + if (IS_MFCV10_PLUS(dev))
> ctx->tmv_buffer_size = 0;
> - } else if (IS_MFCV8_PLUS(dev))
> + else if (IS_MFCV8_PLUS(dev))
> ctx->tmv_buffer_size =
> S5P_FIMV_NUM_TMV_BUFFERS_V6 *
>
> ALIGN(S5P_FIMV_TMV_BUFFER_SIZE_V8(mb_width, mb_height),
> S5P_FIMV_TMV_BUFFER_ALIGN_V6);
> @@ -82,7 +82,7 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct
> s5p_mfc_ctx *ctx)
> ctx->tmv_buffer_size =
> S5P_FIMV_NUM_TMV_BUFFERS_V6 *
>
> ALIGN(S5P_FIMV_TMV_BUFFER_SIZE_V6(mb_width, mb_height),
> S5P_FIMV_TMV_BUFFER_ALIGN_V6);
> - if (IS_MFCV10(dev)) {
> + if (IS_MFCV10_PLUS(dev)) {
> lcu_width = S5P_MFC_LCU_WIDTH(ctx->img_width);
> lcu_height = S5P_MFC_LCU_HEIGHT(ctx-
> >img_height);
> if (ctx->codec_mode !=
> S5P_FIMV_CODEC_HEVC_ENC) { @@ -133,7 +133,7 @@ static int
> s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx)
> switch (ctx->codec_mode) {
> case S5P_MFC_CODEC_H264_DEC:
> case S5P_MFC_CODEC_H264_MVC_DEC:
> - if (IS_MFCV10(dev))
> + if (IS_MFCV10_PLUS(dev))
> mfc_debug(2, "Use min scratch buffer size\n");
> else if (IS_MFCV8_PLUS(dev))
> ctx->scratch_buf_size =
> @@ -152,7 +152,7 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct
> s5p_mfc_ctx *ctx)
> (ctx->mv_count * ctx->mv_size);
> break;
> case S5P_MFC_CODEC_MPEG4_DEC:
> - if (IS_MFCV10(dev))
> + if (IS_MFCV10_PLUS(dev))
> mfc_debug(2, "Use min scratch buffer size\n");
> else if (IS_MFCV7_PLUS(dev)) {
> ctx->scratch_buf_size =
> @@ -172,7 +172,7 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct
> s5p_mfc_ctx *ctx)
> break;
> case S5P_MFC_CODEC_VC1RCV_DEC:
> case S5P_MFC_CODEC_VC1_DEC:
> - if (IS_MFCV10(dev))
> + if (IS_MFCV10_PLUS(dev))
> mfc_debug(2, "Use min scratch buffer size\n");
> else
> ctx->scratch_buf_size =
> @@ -189,7 +189,7 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct
> s5p_mfc_ctx *ctx)
> ctx->bank2.size = 0;
> break;
> case S5P_MFC_CODEC_H263_DEC:
> - if (IS_MFCV10(dev))
> + if (IS_MFCV10_PLUS(dev))
> mfc_debug(2, "Use min scratch buffer size\n");
> else
> ctx->scratch_buf_size =
> @@ -201,7 +201,7 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct
> s5p_mfc_ctx *ctx)
> ctx->bank1.size = ctx->scratch_buf_size;
> break;
> case S5P_MFC_CODEC_VP8_DEC:
> - if (IS_MFCV10(dev))
> + if (IS_MFCV10_PLUS(dev))
> mfc_debug(2, "Use min scratch buffer size\n");
> else if (IS_MFCV8_PLUS(dev))
> ctx->scratch_buf_size =
> @@ -230,7 +230,7 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct
> s5p_mfc_ctx *ctx)
> DEC_VP9_STATIC_BUFFER_SIZE;
> break;
> case S5P_MFC_CODEC_H264_ENC:
> - if (IS_MFCV10(dev)) {
> + if (IS_MFCV10_PLUS(dev)) {
> mfc_debug(2, "Use min scratch buffer size\n");
> ctx->me_buffer_size =
> ALIGN(ENC_V100_H264_ME_SIZE(mb_width,
> mb_height), 16); @@ -254,7 +254,7 @@ static int
> s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx)
> break;
> case S5P_MFC_CODEC_MPEG4_ENC:
> case S5P_MFC_CODEC_H263_ENC:
> - if (IS_MFCV10(dev)) {
> + if (IS_MFCV10_PLUS(dev)) {
> mfc_debug(2, "Use min scratch buffer size\n");
> ctx->me_buffer_size =
>
> ALIGN(ENC_V100_MPEG4_ME_SIZE(mb_width,
> @@ -273,7 +273,7 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct
> s5p_mfc_ctx *ctx)
> ctx->bank2.size = 0;
> break;
> case S5P_MFC_CODEC_VP8_ENC:
> - if (IS_MFCV10(dev)) {
> + if (IS_MFCV10_PLUS(dev)) {
> mfc_debug(2, "Use min scratch buffer size\n");
> ctx->me_buffer_size =
> ALIGN(ENC_V100_VP8_ME_SIZE(mb_width,
> mb_height), @@ -452,7 +452,7 @@ static void
> s5p_mfc_dec_calc_dpb_size_v6(struct s5p_mfc_ctx *ctx)
>
> if (ctx->codec_mode == S5P_MFC_CODEC_H264_DEC ||
> ctx->codec_mode ==
> S5P_MFC_CODEC_H264_MVC_DEC) {
> - if (IS_MFCV10(dev)) {
> + if (IS_MFCV10_PLUS(dev)) {
> ctx->mv_size = S5P_MFC_DEC_MV_SIZE_V10(ctx-
> >img_width,
> ctx->img_height);
> } else {
> @@ -668,7 +668,7 @@ static int s5p_mfc_set_enc_ref_buffer_v6(struct
> s5p_mfc_ctx *ctx)
>
> mfc_debug(2, "Buf1: %p (%d)\n", (void *)buf_addr1, buf_size1);
>
> - if (IS_MFCV10(dev)) {
> + if (IS_MFCV10_PLUS(dev)) {
> /* start address of per buffer is aligned */
> for (i = 0; i < ctx->pb_count; i++) {
> writel(buf_addr1, mfc_regs->e_luma_dpb + (4 * i));
> @@ -2455,7 +2455,7 @@ const struct s5p_mfc_regs
> *s5p_mfc_init_regs_v6_plus(struct s5p_mfc_dev *dev)
> R(e_h264_options, S5P_FIMV_E_H264_OPTIONS_V8);
> R(e_min_scratch_buffer_size,
> S5P_FIMV_E_MIN_SCRATCH_BUFFER_SIZE_V8);
>
> - if (!IS_MFCV10(dev))
> + if (!IS_MFCV10_PLUS(dev))
> goto done;
>
> /* Initialize registers used in MFC v10 only.
> --
> 2.17.1
next prev parent reply other threads:[~2023-11-16 5:00 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20231025102230epcas5p1558641a18fbf4f841c82b0ef4cf5a91f@epcas5p1.samsung.com>
2023-10-25 10:22 ` [Patch v4 00/11] Add MFC V12 support Aakarsh Jain
[not found] ` <CGME20231025102233epcas5p16b716d5b650bbc5af0d759ea4f58f44d@epcas5p1.samsung.com>
2023-10-25 10:22 ` [Patch v4 01/11] dt-bindings: media: s5p-mfc: Add mfcv12 variant Aakarsh Jain
2023-10-25 13:00 ` Krzysztof Kozlowski
2023-10-26 13:31 ` Aakarsh Jain
2023-11-01 8:24 ` Krzysztof Kozlowski
2023-11-08 17:24 ` Alim Akhtar
[not found] ` <CGME20231025102237epcas5p28a5ad9db8d7dea072a6986d530810dde@epcas5p2.samsung.com>
2023-10-25 10:22 ` [Patch v4 02/11] media: s5p-mfc: Rename IS_MFCV10 macro Aakarsh Jain
2023-11-16 5:00 ` Alim Akhtar [this message]
[not found] ` <CGME20231025102240epcas5p1551ac81bc2cd45f6c84e2eebc11571c4@epcas5p1.samsung.com>
2023-10-25 10:22 ` [Patch v4 03/11] media: s5p-mfc: Add initial support for MFCv12 Aakarsh Jain
2023-11-16 5:44 ` Alim Akhtar
2023-11-22 15:34 ` Hans Verkuil
2023-11-27 6:44 ` Aakarsh Jain
[not found] ` <CGME20231025102243epcas5p1cdd0eb385d2381943d6d194eec3a569d@epcas5p1.samsung.com>
2023-10-25 10:22 ` [Patch v4 04/11] media: s5p-mfc: Add YV12 and I420 multiplanar format support Aakarsh Jain
2023-11-22 15:40 ` Hans Verkuil
2023-11-27 7:01 ` Aakarsh Jain
2023-11-23 17:25 ` Nicolas Dufresne
2023-11-27 7:00 ` Aakarsh Jain
[not found] ` <CGME20231025102247epcas5p1103ae6d3194f2ffc354984e263ab7b4a@epcas5p1.samsung.com>
2023-10-25 10:22 ` [Patch v4 05/11] media: s5p-mfc: Add support for rate controls in MFCv12 Aakarsh Jain
[not found] ` <CGME20231025102250epcas5p375603c0f150fd508f0c0aa3ec6305517@epcas5p3.samsung.com>
2023-10-25 10:22 ` [Patch v4 06/11] media: s5p-mfc: Add support for UHD encoding Aakarsh Jain
[not found] ` <CGME20231025102253epcas5p4e57ce0924392b879d8d296f66613a798@epcas5p4.samsung.com>
2023-10-25 10:22 ` [Patch v4 07/11] media: s5p-mfc: Add support for DMABUF for encoder Aakarsh Jain
[not found] ` <CGME20231025102257epcas5p4bf00a54078bf640dfb2e2e03e671453c@epcas5p4.samsung.com>
2023-10-25 10:22 ` [Patch v4 08/11] media: s5p-mfc: Set context for valid case before calling try_run Aakarsh Jain
[not found] ` <CGME20231025102300epcas5p2c266a078b70614dc948b0e47cd5cf788@epcas5p2.samsung.com>
2023-10-25 10:22 ` [Patch v4 09/11] media: s5p-mfc: Load firmware for each run in MFCv12 Aakarsh Jain
2023-11-22 15:44 ` Hans Verkuil
2023-11-28 10:31 ` Aakarsh Jain
[not found] ` <CGME20231025102304epcas5p2065f908cb77558ef5573fbaab82352bd@epcas5p2.samsung.com>
2023-10-25 10:22 ` [Patch v4 10/11] media: s5p-mfc: DPB Count Independent of VIDIOC_REQBUF Aakarsh Jain
[not found] ` <CGME20231025102307epcas5p1fde3d5b0095477a8a565ce9f913e71e5@epcas5p1.samsung.com>
2023-10-25 10:22 ` [Patch v4 11/11] arm64: dts: fsd: Add MFC related DT enteries Aakarsh Jain
2023-11-20 12:48 ` [Patch v4 00/11] Add MFC V12 support Aakarsh Jain
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='0d2801da1849$c34ddc70$49e99550$@samsung.com' \
--to=alim.akhtar@samsung.com \
--cc=aakarsh.jain@samsung.com \
--cc=ajaykumar.rs@samsung.com \
--cc=andi@etezian.org \
--cc=andrzej.hajda@intel.com \
--cc=aswani.reddy@samsung.com \
--cc=conor+dt@kernel.org \
--cc=david.plowman@raspberrypi.com \
--cc=devicetree@vger.kernel.org \
--cc=dillon.minfei@gmail.com \
--cc=gost.dev@samsung.com \
--cc=hverkuil-cisco@xs4all.nl \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-fsd@tesla.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=mark.rutland@arm.com \
--cc=mchehab@kernel.org \
--cc=pankaj.dubey@samsung.com \
--cc=robh+dt@kernel.org \
--cc=smithatmurthy@gmail.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).