From: smitha.t@samsung.com (Smitha T Murthy)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 01/11] [media] s5p-mfc: Rename IS_MFCV8 macro
Date: Tue, 31 Jan 2017 14:26:34 +0530 [thread overview]
Message-ID: <1485852994.16927.6.camel@smitha-fedora> (raw)
In-Reply-To: <35fef778-fa21-5f40-d399-96acd64c8511@samsung.com>
On Wed, 2017-01-18 at 15:51 +0100, Andrzej Hajda wrote:
> On 18.01.2017 11:01, Smitha T Murthy wrote:
> > This patch renames macro IS_MFCV8 to IS_MFCV8_PLUS so that the MFCv8
> > code can be resued for MFCv10.10 support. Since the MFCv8 specific code
> > holds good for MFC v10.10 also.
> >
> > Signed-off-by: Smitha T Murthy <smitha.t@samsung.com>
>
> Acked-by: Andrzej Hajda <a.hajda@samsung.com>
Thanks for review and ack.
Regards,
Smitha
> --
> Regards
> Andrzej
>
> > ---
> > drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 2 +-
> > drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 2 +-
> > drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 2 +-
> > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 18 +++++++++---------
> > 4 files changed, 12 insertions(+), 12 deletions(-)
> >
> > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> > index ab23236..b45d18c 100644
> > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> > @@ -722,7 +722,7 @@ struct mfc_control {
> > #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(dev) (dev->variant->version >= 0x80 ? 1 : 0)
> > +#define IS_MFCV8_PLUS(dev) (dev->variant->version >= 0x80 ? 1 : 0)
> >
> > #define MFC_V5_BIT BIT(0)
> > #define MFC_V6_BIT BIT(1)
> > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
> > index cc88871..484af6b 100644
> > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
> > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
> > @@ -427,7 +427,7 @@ int s5p_mfc_wakeup(struct s5p_mfc_dev *dev)
> > s5p_mfc_clear_cmds(dev);
> > s5p_mfc_clean_dev_int_flags(dev);
> > /* 3. Send MFC wakeup command and wait for completion*/
> > - if (IS_MFCV8(dev))
> > + if (IS_MFCV8_PLUS(dev))
> > ret = s5p_mfc_v8_wait_wakeup(dev);
> > else
> > ret = s5p_mfc_wait_wakeup(dev);
> > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
> > index 367ef8e..0ec2928 100644
> > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
> > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
> > @@ -1177,7 +1177,7 @@ void s5p_mfc_dec_init(struct s5p_mfc_ctx *ctx)
> > struct v4l2_format f;
> > f.fmt.pix_mp.pixelformat = V4L2_PIX_FMT_H264;
> > ctx->src_fmt = find_format(&f, MFC_FMT_DEC);
> > - if (IS_MFCV8(ctx->dev))
> > + if (IS_MFCV8_PLUS(ctx->dev))
> > f.fmt.pix_mp.pixelformat = V4L2_PIX_FMT_NV12M;
> > else if (IS_MFCV6_PLUS(ctx->dev))
> > f.fmt.pix_mp.pixelformat = V4L2_PIX_FMT_NV12MT_16X16;
> > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
> > index 57da798..0572521 100644
> > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
> > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
> > @@ -74,7 +74,7 @@ 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_MFCV8(dev))
> > + 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);
> > @@ -89,7 +89,7 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx)
> > ctx->chroma_dpb_size = ALIGN((mb_width * mb_height) *
> > S5P_FIMV_CHROMA_MB_TO_PIXEL_V6,
> > S5P_FIMV_CHROMA_DPB_BUFFER_ALIGN_V6);
> > - if (IS_MFCV8(dev))
> > + if (IS_MFCV8_PLUS(dev))
> > ctx->me_buffer_size = ALIGN(S5P_FIMV_ME_BUFFER_SIZE_V8(
> > ctx->img_width, ctx->img_height,
> > mb_width, mb_height),
> > @@ -110,7 +110,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_MFCV8(dev))
> > + if (IS_MFCV8_PLUS(dev))
> > ctx->scratch_buf_size =
> > S5P_FIMV_SCRATCH_BUF_SIZE_H264_DEC_V8(
> > mb_width,
> > @@ -167,7 +167,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_MFCV8(dev))
> > + if (IS_MFCV8_PLUS(dev))
> > ctx->scratch_buf_size =
> > S5P_FIMV_SCRATCH_BUF_SIZE_VP8_DEC_V8(
> > mb_width,
> > @@ -182,7 +182,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_H264_ENC:
> > - if (IS_MFCV8(dev))
> > + if (IS_MFCV8_PLUS(dev))
> > ctx->scratch_buf_size =
> > S5P_FIMV_SCRATCH_BUF_SIZE_H264_ENC_V8(
> > mb_width,
> > @@ -215,7 +215,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_MFCV8(dev))
> > + if (IS_MFCV8_PLUS(dev))
> > ctx->scratch_buf_size =
> > S5P_FIMV_SCRATCH_BUF_SIZE_VP8_ENC_V8(
> > mb_width,
> > @@ -366,7 +366,7 @@ static void s5p_mfc_dec_calc_dpb_size_v6(struct s5p_mfc_ctx *ctx)
> >
> > ctx->luma_size = calc_plane(ctx->img_width, ctx->img_height);
> > ctx->chroma_size = calc_plane(ctx->img_width, (ctx->img_height >> 1));
> > - if (IS_MFCV8(ctx->dev)) {
> > + if (IS_MFCV8_PLUS(ctx->dev)) {
> > /* MFCv8 needs additional 64 bytes for luma,chroma dpb*/
> > ctx->luma_size += S5P_FIMV_D_ALIGN_PLANE_SIZE_V8;
> > ctx->chroma_size += S5P_FIMV_D_ALIGN_PLANE_SIZE_V8;
> > @@ -454,7 +454,7 @@ static int s5p_mfc_set_dec_frame_buffer_v6(struct s5p_mfc_ctx *ctx)
> > writel(buf_addr1, mfc_regs->d_scratch_buffer_addr);
> > writel(ctx->scratch_buf_size, mfc_regs->d_scratch_buffer_size);
> >
> > - if (IS_MFCV8(dev)) {
> > + if (IS_MFCV8_PLUS(dev)) {
> > writel(ctx->img_width,
> > mfc_regs->d_first_plane_dpb_stride_size);
> > writel(ctx->img_width,
> > @@ -2120,7 +2120,7 @@ static unsigned int s5p_mfc_get_crop_info_v_v6(struct s5p_mfc_ctx *ctx)
> > S5P_FIMV_E_ENCODED_SOURCE_SECOND_ADDR_V7);
> > R(e_vp8_options, S5P_FIMV_E_VP8_OPTIONS_V7);
> >
> > - if (!IS_MFCV8(dev))
> > + if (!IS_MFCV8_PLUS(dev))
> > goto done;
> >
> > /* Initialize registers used in MFC v8 only.
>
>
>
next prev parent reply other threads:[~2017-01-31 8:56 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20170118100714epcas1p274e2e68d14a788417fbde2c26c91bcb9@epcas1p2.samsung.com>
2017-01-18 10:01 ` [PATCH 00/11] Add MFC v10.10 support Smitha T Murthy
[not found] ` <CGME20170118100718epcas5p1f9aebb16fc61d41a13d09054fa96a14d@epcas5p1.samsung.com>
2017-01-18 10:01 ` [PATCH 01/11] [media] s5p-mfc: Rename IS_MFCV8 macro Smitha T Murthy
2017-01-18 14:51 ` Andrzej Hajda
2017-01-31 8:56 ` Smitha T Murthy [this message]
[not found] ` <CGME20170118100723epcas5p132e0ebfad38261bed95cffc47334f9dc@epcas5p1.samsung.com>
2017-01-18 10:02 ` [PATCH 02/11] [media] s5p-mfc: Adding initial support for MFC v10.10 Smitha T Murthy
2017-01-18 15:10 ` Andrzej Hajda
2017-01-31 9:12 ` Smitha T Murthy
2017-01-21 20:28 ` Rob Herring
2017-02-06 8:37 ` Smitha T Murthy
[not found] ` <CGME20170118100726epcas1p2d443360ea389ccb0826a1b5c5512da55@epcas1p2.samsung.com>
2017-01-18 10:02 ` [PATCH 03/11] [media] s5p-mfc: Use min scratch buffer size Smitha T Murthy
2017-02-02 7:16 ` Andrzej Hajda
2017-02-06 8:38 ` Smitha T Murthy
[not found] ` <CGME20170118100731epcas5p16f07548a8a6c95f2ef539704e032a54d@epcas5p1.samsung.com>
2017-01-18 10:02 ` [PATCH 04/11] [media] s5p-mfc: Support MFCv10.10 buffer requirements Smitha T Murthy
2017-02-02 8:30 ` Andrzej Hajda
2017-02-06 8:41 ` Smitha T Murthy
[not found] ` <CGME20170118100737epcas1p269ede3c99e71ce55b934945cd20181e1@epcas1p2.samsung.com>
2017-01-18 10:02 ` [PATCH 05/11] [media] s5p-mfc: Add support for HEVC decoder Smitha T Murthy
2017-02-02 7:58 ` Andrzej Hajda
2017-02-02 8:20 ` Andrzej Hajda
2017-02-06 8:39 ` Smitha T Murthy
2017-02-06 8:39 ` Smitha T Murthy
[not found] ` <CGME20170118100742epcas5p1bb390dffa4fe530d94573f41d8791ef7@epcas5p1.samsung.com>
2017-01-18 10:02 ` [PATCH 06/11] [media] videodev2.h: Add v4l2 definition for HEVC Smitha T Murthy
2017-02-02 8:34 ` Andrzej Hajda
2017-02-06 8:41 ` Smitha T Murthy
[not found] ` <CGME20170118100756epcas1p2c8a93b383a4c85648b5e9efac8cea9c7@epcas1p2.samsung.com>
2017-01-18 10:02 ` [PATCH 08/11] [media] s5p-mfc: Add VP9 decoder support Smitha T Murthy
2017-02-02 8:39 ` Andrzej Hajda
2017-02-06 8:42 ` Smitha T Murthy
[not found] ` <CGME20170118100807epcas5p1a0af682c334aa9581f32cbf7f1f264c2@epcas5p1.samsung.com>
2017-01-18 10:02 ` [PATCH 09/11] [media] s5p-mfc: Add support for HEVC encoder Smitha T Murthy
2017-02-02 8:55 ` Andrzej Hajda
2017-02-06 8:42 ` Smitha T Murthy
[not found] ` <CGME20170118100818epcas5p1c7153a6fe9d93f96269008f42f736b90@epcas5p1.samsung.com>
2017-01-18 10:02 ` [PATCH 10/11] [media] v4l2: Add v4l2 control IDs " Smitha T Murthy
2017-02-06 14:54 ` Andrzej Hajda
2017-02-13 5:33 ` Smitha T Murthy
[not found] ` <CGME20170118100827epcas5p16023525ba778b58b8e9a31b8a764b382@epcas5p1.samsung.com>
2017-01-18 10:02 ` [PATCH 11/11] Documention: v4l: Documentation for HEVC CIDs Smitha T Murthy
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=1485852994.16927.6.camel@smitha-fedora \
--to=smitha.t@samsung.com \
--cc=linux-arm-kernel@lists.infradead.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).