* [PATCH 02/11] [media] s5p-mfc: Adding initial support for MFC v10.10 [not found] ` <CGME20170118100723epcas5p132e0ebfad38261bed95cffc47334f9dc@epcas5p1.samsung.com> @ 2017-01-18 10:02 ` Smitha T Murthy 2017-01-18 15:10 ` Andrzej Hajda 2017-01-21 20:28 ` Rob Herring 0 siblings, 2 replies; 5+ messages in thread From: Smitha T Murthy @ 2017-01-18 10:02 UTC (permalink / raw) To: linux-arm-kernel, linux-media, linux-kernel Cc: devicetree, a.hajda, pankaj.dubey, kamil, krzk, jtp.park, kyungmin.park, Rob Herring, s.nawrocki, Smitha T Murthy, mchehab, m.szyprowski Adding the support for MFC v10.10, with new register file and necessary hw control, decoder, encoder and structural changes. CC: Rob Herring <robh+dt@kernel.org> CC: devicetree@vger.kernel.org Signed-off-by: Smitha T Murthy <smitha.t@samsung.com> --- .../devicetree/bindings/media/s5p-mfc.txt | 1 + drivers/media/platform/s5p-mfc/regs-mfc-v10.h | 36 ++++++++++++++++ drivers/media/platform/s5p-mfc/s5p_mfc.c | 30 +++++++++++++ drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 4 +- drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 4 ++ drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 44 +++++++++++--------- drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 21 +++++---- drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 9 +++- drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 2 + 9 files changed, 118 insertions(+), 33 deletions(-) create mode 100644 drivers/media/platform/s5p-mfc/regs-mfc-v10.h diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt b/Documentation/devicetree/bindings/media/s5p-mfc.txt index 2c90128..b70c613 100644 --- a/Documentation/devicetree/bindings/media/s5p-mfc.txt +++ b/Documentation/devicetree/bindings/media/s5p-mfc.txt @@ -13,6 +13,7 @@ Required properties: (c) "samsung,mfc-v7" for MFC v7 present in Exynos5420 SoC (d) "samsung,mfc-v8" for MFC v8 present in Exynos5800 SoC (e) "samsung,exynos5433-mfc" for MFC v8 present in Exynos5433 SoC + (f) "samsung,mfc-v10" for MFC v10 present in a variant of Exynos7 SoC - reg : Physical base address of the IP registers and length of memory mapped region. diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h b/drivers/media/platform/s5p-mfc/regs-mfc-v10.h new file mode 100644 index 0000000..bd671a5 --- /dev/null +++ b/drivers/media/platform/s5p-mfc/regs-mfc-v10.h @@ -0,0 +1,36 @@ +/* + * Register definition file for Samsung MFC V10.x Interface (FIMV) driver + * + * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * http://www.samsung.com/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef _REGS_MFC_V10_H +#define _REGS_MFC_V10_H + +#include <linux/sizes.h> +#include "regs-mfc-v8.h" + +/* MFCv10 register definitions*/ +#define S5P_FIMV_MFC_CLOCK_OFF_V10 0x7120 +#define S5P_FIMV_MFC_STATE_V10 0x7124 + +/* MFCv10 Context buffer sizes */ +#define MFC_CTX_BUF_SIZE_V10 (30 * SZ_1K) /* 30KB */ +#define MFC_H264_DEC_CTX_BUF_SIZE_V10 (2 * SZ_1M) /* 2MB */ +#define MFC_OTHER_DEC_CTX_BUF_SIZE_V10 (20 * SZ_1K) /* 20KB */ +#define MFC_H264_ENC_CTX_BUF_SIZE_V10 (100 * SZ_1K) /* 100KB */ +#define MFC_OTHER_ENC_CTX_BUF_SIZE_V10 (15 * SZ_1K) /* 15KB */ + +/* MFCv10 variant defines */ +#define MAX_FW_SIZE_V10 (SZ_1M) /* 1MB */ +#define MAX_CPB_SIZE_V10 (3 * SZ_1M) /* 3MB */ +#define MFC_VERSION_V10 0xA0 +#define MFC_NUM_PORTS_V10 1 + +#endif /*_REGS_MFC_V10_H*/ + diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index bb0a588..a043cce 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -1542,6 +1542,33 @@ static int s5p_mfc_resume(struct device *dev) .num_clocks = 3, }; +static struct s5p_mfc_buf_size_v6 mfc_buf_size_v10 = { + .dev_ctx = MFC_CTX_BUF_SIZE_V10, + .h264_dec_ctx = MFC_H264_DEC_CTX_BUF_SIZE_V10, + .other_dec_ctx = MFC_OTHER_DEC_CTX_BUF_SIZE_V10, + .h264_enc_ctx = MFC_H264_ENC_CTX_BUF_SIZE_V10, + .other_enc_ctx = MFC_OTHER_ENC_CTX_BUF_SIZE_V10, +}; + +static struct s5p_mfc_buf_size buf_size_v10 = { + .fw = MAX_FW_SIZE_V10, + .cpb = MAX_CPB_SIZE_V10, + .priv = &mfc_buf_size_v10, +}; + +static struct s5p_mfc_buf_align mfc_buf_align_v10 = { + .base = 0, +}; + +static struct s5p_mfc_variant mfc_drvdata_v10 = { + .version = MFC_VERSION_V10, + .version_bit = MFC_V10_BIT, + .port_num = MFC_NUM_PORTS_V10, + .buf_size = &buf_size_v10, + .buf_align = &mfc_buf_align_v10, + .fw_name[0] = "s5p-mfc-v10.fw", +}; + static const struct of_device_id exynos_mfc_match[] = { { .compatible = "samsung,mfc-v5", @@ -1558,6 +1585,9 @@ static int s5p_mfc_resume(struct device *dev) }, { .compatible = "samsung,exynos5433-mfc", .data = &mfc_drvdata_v8_5433, + }, { + .compatible = "samsung,mfc-v10", + .data = &mfc_drvdata_v10, }, {}, }; diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h index b45d18c..1941c63 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h @@ -23,7 +23,7 @@ #include <media/v4l2-ioctl.h> #include <media/videobuf2-v4l2.h> #include "regs-mfc.h" -#include "regs-mfc-v8.h" +#include "regs-mfc-v10.h" #define S5P_MFC_NAME "s5p-mfc" @@ -723,11 +723,13 @@ struct mfc_control { #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 MFC_V5_BIT BIT(0) #define MFC_V6_BIT BIT(1) #define MFC_V7_BIT BIT(2) #define MFC_V8_BIT BIT(3) +#define MFC_V10_BIT BIT(5) #endif /* S5P_MFC_COMMON_H_ */ diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c index 484af6b..0ded23c 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c @@ -267,6 +267,10 @@ int s5p_mfc_init_hw(struct s5p_mfc_dev *dev) } else mfc_write(dev, 0x3ff, S5P_FIMV_SW_RESET); + + if (IS_MFCV10(dev)) + mfc_write(dev, 0x0, S5P_FIMV_MFC_CLOCK_OFF_V10); + mfc_debug(2, "Will now wait for completion of firmware transfer\n"); if (s5p_mfc_wait_for_done_dev(dev, S5P_MFC_R2H_CMD_FW_STATUS_RET)) { mfc_err("Failed to load firmware\n"); diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c index 0ec2928..784b28e 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c @@ -54,7 +54,8 @@ .codec_mode = S5P_MFC_CODEC_NONE, .type = MFC_FMT_RAW, .num_planes = 2, - .versions = MFC_V6_BIT | MFC_V7_BIT | MFC_V8_BIT, + .versions = MFC_V6_BIT | MFC_V7_BIT | MFC_V8_BIT | + MFC_V10_BIT, }, { .name = "4:2:0 2 Planes Y/CrCb", @@ -62,7 +63,8 @@ .codec_mode = S5P_MFC_CODEC_NONE, .type = MFC_FMT_RAW, .num_planes = 2, - .versions = MFC_V6_BIT | MFC_V7_BIT | MFC_V8_BIT, + .versions = MFC_V6_BIT | MFC_V7_BIT | MFC_V8_BIT | + MFC_V10_BIT, }, { .name = "H264 Encoded Stream", @@ -70,8 +72,8 @@ .codec_mode = S5P_MFC_CODEC_H264_DEC, .type = MFC_FMT_DEC, .num_planes = 1, - .versions = MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT | - MFC_V8_BIT, + .versions = MFC_V5_BIT | MFC_V6_BIT | + MFC_V7_BIT | MFC_V8_BIT | MFC_V10_BIT, }, { .name = "H264/MVC Encoded Stream", @@ -79,7 +81,8 @@ .codec_mode = S5P_MFC_CODEC_H264_MVC_DEC, .type = MFC_FMT_DEC, .num_planes = 1, - .versions = MFC_V6_BIT | MFC_V7_BIT | MFC_V8_BIT, + .versions = MFC_V6_BIT | MFC_V7_BIT | MFC_V8_BIT | + MFC_V10_BIT, }, { .name = "H263 Encoded Stream", @@ -87,8 +90,8 @@ .codec_mode = S5P_MFC_CODEC_H263_DEC, .type = MFC_FMT_DEC, .num_planes = 1, - .versions = MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT | - MFC_V8_BIT, + .versions = MFC_V5_BIT | MFC_V6_BIT | + MFC_V7_BIT | MFC_V8_BIT | MFC_V10_BIT, }, { .name = "MPEG1 Encoded Stream", @@ -96,8 +99,8 @@ .codec_mode = S5P_MFC_CODEC_MPEG2_DEC, .type = MFC_FMT_DEC, .num_planes = 1, - .versions = MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT | - MFC_V8_BIT, + .versions = MFC_V5_BIT | MFC_V6_BIT | + MFC_V7_BIT | MFC_V8_BIT | MFC_V10_BIT, }, { .name = "MPEG2 Encoded Stream", @@ -105,8 +108,8 @@ .codec_mode = S5P_MFC_CODEC_MPEG2_DEC, .type = MFC_FMT_DEC, .num_planes = 1, - .versions = MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT | - MFC_V8_BIT, + .versions = MFC_V5_BIT | MFC_V6_BIT | + MFC_V7_BIT | MFC_V8_BIT | MFC_V10_BIT, }, { .name = "MPEG4 Encoded Stream", @@ -114,8 +117,8 @@ .codec_mode = S5P_MFC_CODEC_MPEG4_DEC, .type = MFC_FMT_DEC, .num_planes = 1, - .versions = MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT | - MFC_V8_BIT, + .versions = MFC_V5_BIT | MFC_V6_BIT | + MFC_V7_BIT | MFC_V8_BIT | MFC_V10_BIT, }, { .name = "XviD Encoded Stream", @@ -123,8 +126,8 @@ .codec_mode = S5P_MFC_CODEC_MPEG4_DEC, .type = MFC_FMT_DEC, .num_planes = 1, - .versions = MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT | - MFC_V8_BIT, + .versions = MFC_V5_BIT | MFC_V6_BIT | + MFC_V7_BIT | MFC_V8_BIT | MFC_V10_BIT, }, { .name = "VC1 Encoded Stream", @@ -132,8 +135,8 @@ .codec_mode = S5P_MFC_CODEC_VC1_DEC, .type = MFC_FMT_DEC, .num_planes = 1, - .versions = MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT | - MFC_V8_BIT, + .versions = MFC_V5_BIT | MFC_V6_BIT | + MFC_V7_BIT | MFC_V8_BIT | MFC_V10_BIT, }, { .name = "VC1 RCV Encoded Stream", @@ -141,8 +144,8 @@ .codec_mode = S5P_MFC_CODEC_VC1RCV_DEC, .type = MFC_FMT_DEC, .num_planes = 1, - .versions = MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT | - MFC_V8_BIT, + .versions = MFC_V5_BIT | MFC_V6_BIT | + MFC_V7_BIT | MFC_V8_BIT | MFC_V10_BIT, }, { .name = "VP8 Encoded Stream", @@ -150,7 +153,8 @@ .codec_mode = S5P_MFC_CODEC_VP8_DEC, .type = MFC_FMT_DEC, .num_planes = 1, - .versions = MFC_V6_BIT | MFC_V7_BIT | MFC_V8_BIT, + .versions = MFC_V6_BIT | MFC_V7_BIT | MFC_V8_BIT | + MFC_V10_BIT, }, }; diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c index e39d9e0..9042378 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c @@ -57,8 +57,8 @@ .codec_mode = S5P_MFC_CODEC_NONE, .type = MFC_FMT_RAW, .num_planes = 2, - .versions = MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT | - MFC_V8_BIT, + .versions = MFC_V5_BIT | MFC_V6_BIT | + MFC_V7_BIT | MFC_V8_BIT | MFC_V10_BIT, }, { .name = "4:2:0 2 Planes Y/CrCb", @@ -66,7 +66,8 @@ .codec_mode = S5P_MFC_CODEC_NONE, .type = MFC_FMT_RAW, .num_planes = 2, - .versions = MFC_V6_BIT | MFC_V7_BIT | MFC_V8_BIT, + .versions = MFC_V6_BIT | MFC_V7_BIT | MFC_V8_BIT | + MFC_V10_BIT, }, { .name = "H264 Encoded Stream", @@ -74,8 +75,8 @@ .codec_mode = S5P_MFC_CODEC_H264_ENC, .type = MFC_FMT_ENC, .num_planes = 1, - .versions = MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT | - MFC_V8_BIT, + .versions = MFC_V5_BIT | MFC_V6_BIT | + MFC_V7_BIT | MFC_V8_BIT | MFC_V10_BIT, }, { .name = "MPEG4 Encoded Stream", @@ -83,8 +84,8 @@ .codec_mode = S5P_MFC_CODEC_MPEG4_ENC, .type = MFC_FMT_ENC, .num_planes = 1, - .versions = MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT | - MFC_V8_BIT, + .versions = MFC_V5_BIT | MFC_V6_BIT | + MFC_V7_BIT | MFC_V8_BIT | MFC_V10_BIT, }, { .name = "H263 Encoded Stream", @@ -92,8 +93,8 @@ .codec_mode = S5P_MFC_CODEC_H263_ENC, .type = MFC_FMT_ENC, .num_planes = 1, - .versions = MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT | - MFC_V8_BIT, + .versions = MFC_V5_BIT | MFC_V6_BIT | + MFC_V7_BIT | MFC_V8_BIT | MFC_V10_BIT, }, { .name = "VP8 Encoded Stream", @@ -101,7 +102,7 @@ .codec_mode = S5P_MFC_CODEC_VP8_ENC, .type = MFC_FMT_ENC, .num_planes = 1, - .versions = MFC_V7_BIT | MFC_V8_BIT, + .versions = MFC_V7_BIT | MFC_V8_BIT | MFC_V10_BIT, }, }; 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 0572521..63dce5a 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c @@ -358,6 +358,7 @@ static int calc_plane(int width, int height) static void s5p_mfc_dec_calc_dpb_size_v6(struct s5p_mfc_ctx *ctx) { + struct s5p_mfc_dev *dev = ctx->dev; ctx->buf_width = ALIGN(ctx->img_width, S5P_FIMV_NV12MT_HALIGN_V6); ctx->buf_height = ALIGN(ctx->img_height, S5P_FIMV_NV12MT_VALIGN_V6); mfc_debug(2, "SEQ Done: Movie dimensions %dx%d,\n" @@ -374,8 +375,12 @@ 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) { - ctx->mv_size = S5P_MFC_DEC_MV_SIZE_V6(ctx->img_width, - ctx->img_height); + if (IS_MFCV10(dev)) + ctx->mv_size = S5P_MFC_DEC_MV_SIZE_V10(ctx->img_width, + ctx->img_height); + else + ctx->mv_size = S5P_MFC_DEC_MV_SIZE_V6(ctx->img_width, + ctx->img_height); ctx->mv_size = ALIGN(ctx->mv_size, 16); } else { ctx->mv_size = 0; diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h index 16a7b1d..fcc2368 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h @@ -24,6 +24,8 @@ #define MB_HEIGHT(y_size) DIV_ROUND_UP(y_size, 16) #define S5P_MFC_DEC_MV_SIZE_V6(x, y) (MB_WIDTH(x) * \ (((MB_HEIGHT(y)+1)/2)*2) * 64 + 128) +#define S5P_MFC_DEC_MV_SIZE_V10(x, y) (MB_WIDTH(x) * \ + (((MB_HEIGHT(y)+1)/2)*2) * 64 + 512) /* Definition */ #define ENC_MULTI_SLICE_MB_MAX ((1 << 30) - 1) -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 02/11] [media] s5p-mfc: Adding initial support for MFC v10.10 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 1 sibling, 1 reply; 5+ messages in thread From: Andrzej Hajda @ 2017-01-18 15:10 UTC (permalink / raw) To: Smitha T Murthy, linux-arm-kernel, linux-media, linux-kernel Cc: kyungmin.park, kamil, jtp.park, mchehab, pankaj.dubey, krzk, m.szyprowski, s.nawrocki, Rob Herring, devicetree On 18.01.2017 11:02, Smitha T Murthy wrote: > Adding the support for MFC v10.10, with new register file and > necessary hw control, decoder, encoder and structural changes. > > CC: Rob Herring <robh+dt@kernel.org> > CC: devicetree@vger.kernel.org > Signed-off-by: Smitha T Murthy <smitha.t@samsung.com> > --- > .../devicetree/bindings/media/s5p-mfc.txt | 1 + > drivers/media/platform/s5p-mfc/regs-mfc-v10.h | 36 ++++++++++++++++ > drivers/media/platform/s5p-mfc/s5p_mfc.c | 30 +++++++++++++ > drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 4 +- > drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 4 ++ > drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 44 +++++++++++--------- > drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 21 +++++---- > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 9 +++- > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 2 + > 9 files changed, 118 insertions(+), 33 deletions(-) > create mode 100644 drivers/media/platform/s5p-mfc/regs-mfc-v10.h > > diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt b/Documentation/devicetree/bindings/media/s5p-mfc.txt > index 2c90128..b70c613 100644 > --- a/Documentation/devicetree/bindings/media/s5p-mfc.txt > +++ b/Documentation/devicetree/bindings/media/s5p-mfc.txt > @@ -13,6 +13,7 @@ Required properties: > (c) "samsung,mfc-v7" for MFC v7 present in Exynos5420 SoC > (d) "samsung,mfc-v8" for MFC v8 present in Exynos5800 SoC > (e) "samsung,exynos5433-mfc" for MFC v8 present in Exynos5433 SoC > + (f) "samsung,mfc-v10" for MFC v10 present in a variant of Exynos7 SoC Could you specify explicitly SoC version(s), Exynos7 is misleading. Btw are there plans to upstream platforms using this MFC? > > - reg : Physical base address of the IP registers and length of memory > mapped region. > diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h b/drivers/media/platform/s5p-mfc/regs-mfc-v10.h > new file mode 100644 > index 0000000..bd671a5 > --- /dev/null > +++ b/drivers/media/platform/s5p-mfc/regs-mfc-v10.h > @@ -0,0 +1,36 @@ > +/* > + * Register definition file for Samsung MFC V10.x Interface (FIMV) driver > + * > + * Copyright (c) 2017 Samsung Electronics Co., Ltd. > + * http://www.samsung.com/ > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + */ > + > +#ifndef _REGS_MFC_V10_H > +#define _REGS_MFC_V10_H > + > +#include <linux/sizes.h> > +#include "regs-mfc-v8.h" > + > +/* MFCv10 register definitions*/ > +#define S5P_FIMV_MFC_CLOCK_OFF_V10 0x7120 > +#define S5P_FIMV_MFC_STATE_V10 0x7124 > + > +/* MFCv10 Context buffer sizes */ > +#define MFC_CTX_BUF_SIZE_V10 (30 * SZ_1K) /* 30KB */ > +#define MFC_H264_DEC_CTX_BUF_SIZE_V10 (2 * SZ_1M) /* 2MB */ > +#define MFC_OTHER_DEC_CTX_BUF_SIZE_V10 (20 * SZ_1K) /* 20KB */ > +#define MFC_H264_ENC_CTX_BUF_SIZE_V10 (100 * SZ_1K) /* 100KB */ > +#define MFC_OTHER_ENC_CTX_BUF_SIZE_V10 (15 * SZ_1K) /* 15KB */ > + > +/* MFCv10 variant defines */ > +#define MAX_FW_SIZE_V10 (SZ_1M) /* 1MB */ > +#define MAX_CPB_SIZE_V10 (3 * SZ_1M) /* 3MB */ > +#define MFC_VERSION_V10 0xA0 > +#define MFC_NUM_PORTS_V10 1 > + > +#endif /*_REGS_MFC_V10_H*/ > + > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c > index bb0a588..a043cce 100644 > --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c > @@ -1542,6 +1542,33 @@ static int s5p_mfc_resume(struct device *dev) > .num_clocks = 3, > }; > > +static struct s5p_mfc_buf_size_v6 mfc_buf_size_v10 = { > + .dev_ctx = MFC_CTX_BUF_SIZE_V10, > + .h264_dec_ctx = MFC_H264_DEC_CTX_BUF_SIZE_V10, > + .other_dec_ctx = MFC_OTHER_DEC_CTX_BUF_SIZE_V10, > + .h264_enc_ctx = MFC_H264_ENC_CTX_BUF_SIZE_V10, > + .other_enc_ctx = MFC_OTHER_ENC_CTX_BUF_SIZE_V10, > +}; > + > +static struct s5p_mfc_buf_size buf_size_v10 = { > + .fw = MAX_FW_SIZE_V10, > + .cpb = MAX_CPB_SIZE_V10, > + .priv = &mfc_buf_size_v10, > +}; > + > +static struct s5p_mfc_buf_align mfc_buf_align_v10 = { > + .base = 0, > +}; > + > +static struct s5p_mfc_variant mfc_drvdata_v10 = { > + .version = MFC_VERSION_V10, > + .version_bit = MFC_V10_BIT, > + .port_num = MFC_NUM_PORTS_V10, > + .buf_size = &buf_size_v10, > + .buf_align = &mfc_buf_align_v10, > + .fw_name[0] = "s5p-mfc-v10.fw", Is firmware file publicly available? Sent to firmware repository? > +}; > + > static const struct of_device_id exynos_mfc_match[] = { > { > .compatible = "samsung,mfc-v5", > @@ -1558,6 +1585,9 @@ static int s5p_mfc_resume(struct device *dev) > }, { > .compatible = "samsung,exynos5433-mfc", > .data = &mfc_drvdata_v8_5433, > + }, { > + .compatible = "samsung,mfc-v10", > + .data = &mfc_drvdata_v10, > }, > {}, > }; > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h > index b45d18c..1941c63 100644 > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h > @@ -23,7 +23,7 @@ > #include <media/v4l2-ioctl.h> > #include <media/videobuf2-v4l2.h> > #include "regs-mfc.h" > -#include "regs-mfc-v8.h" > +#include "regs-mfc-v10.h" > > #define S5P_MFC_NAME "s5p-mfc" > > @@ -723,11 +723,13 @@ struct mfc_control { > #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 MFC_V5_BIT BIT(0) > #define MFC_V6_BIT BIT(1) > #define MFC_V7_BIT BIT(2) > #define MFC_V8_BIT BIT(3) > +#define MFC_V10_BIT BIT(5) I think you can use BIT(4) here. Regards Andrzej ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 02/11] [media] s5p-mfc: Adding initial support for MFC v10.10 2017-01-18 15:10 ` Andrzej Hajda @ 2017-01-31 9:12 ` Smitha T Murthy 0 siblings, 0 replies; 5+ messages in thread From: Smitha T Murthy @ 2017-01-31 9:12 UTC (permalink / raw) To: Andrzej Hajda Cc: devicetree, pankaj.dubey, kamil, krzk, linux-kernel, jtp.park, kyungmin.park, Rob Herring, s.nawrocki, m.szyprowski, mchehab, linux-arm-kernel, linux-media On Wed, 2017-01-18 at 16:10 +0100, Andrzej Hajda wrote: > On 18.01.2017 11:02, Smitha T Murthy wrote: > > Adding the support for MFC v10.10, with new register file and > > necessary hw control, decoder, encoder and structural changes. > > > > CC: Rob Herring <robh+dt@kernel.org> > > CC: devicetree@vger.kernel.org > > Signed-off-by: Smitha T Murthy <smitha.t@samsung.com> > > --- > > .../devicetree/bindings/media/s5p-mfc.txt | 1 + > > drivers/media/platform/s5p-mfc/regs-mfc-v10.h | 36 ++++++++++++++++ > > drivers/media/platform/s5p-mfc/s5p_mfc.c | 30 +++++++++++++ > > drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 4 +- > > drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 4 ++ > > drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 44 +++++++++++--------- > > drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 21 +++++---- > > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 9 +++- > > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 2 + > > 9 files changed, 118 insertions(+), 33 deletions(-) > > create mode 100644 drivers/media/platform/s5p-mfc/regs-mfc-v10.h > > > > diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt b/Documentation/devicetree/bindings/media/s5p-mfc.txt > > index 2c90128..b70c613 100644 > > --- a/Documentation/devicetree/bindings/media/s5p-mfc.txt > > +++ b/Documentation/devicetree/bindings/media/s5p-mfc.txt > > @@ -13,6 +13,7 @@ Required properties: > > (c) "samsung,mfc-v7" for MFC v7 present in Exynos5420 SoC > > (d) "samsung,mfc-v8" for MFC v8 present in Exynos5800 SoC > > (e) "samsung,exynos5433-mfc" for MFC v8 present in Exynos5433 SoC > > + (f) "samsung,mfc-v10" for MFC v10 present in a variant of Exynos7 SoC > > Could you specify explicitly SoC version(s), Exynos7 is misleading. > Btw are there plans to upstream platforms using this MFC? MFCv10.10 is used in Exynos7880. There are other variants of MFCv10 used in Exynos8890 and Exynos7870. I have no plans to upstream the platform support for this SoC, may be other members of Samsung may take it up. But I will mention the SoCs in the next version. > > > > > - reg : Physical base address of the IP registers and length of memory > > mapped region. > > diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h b/drivers/media/platform/s5p-mfc/regs-mfc-v10.h > > new file mode 100644 > > index 0000000..bd671a5 > > --- /dev/null > > +++ b/drivers/media/platform/s5p-mfc/regs-mfc-v10.h > > @@ -0,0 +1,36 @@ > > +/* > > + * Register definition file for Samsung MFC V10.x Interface (FIMV) driver > > + * > > + * Copyright (c) 2017 Samsung Electronics Co., Ltd. > > + * http://www.samsung.com/ > > + * > > + * This program is free software; you can redistribute it and/or modify > > + * it under the terms of the GNU General Public License version 2 as > > + * published by the Free Software Foundation. > > + */ > > + > > +#ifndef _REGS_MFC_V10_H > > +#define _REGS_MFC_V10_H > > + > > +#include <linux/sizes.h> > > +#include "regs-mfc-v8.h" > > + > > +/* MFCv10 register definitions*/ > > +#define S5P_FIMV_MFC_CLOCK_OFF_V10 0x7120 > > +#define S5P_FIMV_MFC_STATE_V10 0x7124 > > + > > +/* MFCv10 Context buffer sizes */ > > +#define MFC_CTX_BUF_SIZE_V10 (30 * SZ_1K) /* 30KB */ > > +#define MFC_H264_DEC_CTX_BUF_SIZE_V10 (2 * SZ_1M) /* 2MB */ > > +#define MFC_OTHER_DEC_CTX_BUF_SIZE_V10 (20 * SZ_1K) /* 20KB */ > > +#define MFC_H264_ENC_CTX_BUF_SIZE_V10 (100 * SZ_1K) /* 100KB */ > > +#define MFC_OTHER_ENC_CTX_BUF_SIZE_V10 (15 * SZ_1K) /* 15KB */ > > + > > +/* MFCv10 variant defines */ > > +#define MAX_FW_SIZE_V10 (SZ_1M) /* 1MB */ > > +#define MAX_CPB_SIZE_V10 (3 * SZ_1M) /* 3MB */ > > +#define MFC_VERSION_V10 0xA0 > > +#define MFC_NUM_PORTS_V10 1 > > + > > +#endif /*_REGS_MFC_V10_H*/ > > + > > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c > > index bb0a588..a043cce 100644 > > --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c > > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c > > @@ -1542,6 +1542,33 @@ static int s5p_mfc_resume(struct device *dev) > > .num_clocks = 3, > > }; > > > > +static struct s5p_mfc_buf_size_v6 mfc_buf_size_v10 = { > > + .dev_ctx = MFC_CTX_BUF_SIZE_V10, > > + .h264_dec_ctx = MFC_H264_DEC_CTX_BUF_SIZE_V10, > > + .other_dec_ctx = MFC_OTHER_DEC_CTX_BUF_SIZE_V10, > > + .h264_enc_ctx = MFC_H264_ENC_CTX_BUF_SIZE_V10, > > + .other_enc_ctx = MFC_OTHER_ENC_CTX_BUF_SIZE_V10, > > +}; > > + > > +static struct s5p_mfc_buf_size buf_size_v10 = { > > + .fw = MAX_FW_SIZE_V10, > > + .cpb = MAX_CPB_SIZE_V10, > > + .priv = &mfc_buf_size_v10, > > +}; > > + > > +static struct s5p_mfc_buf_align mfc_buf_align_v10 = { > > + .base = 0, > > +}; > > + > > +static struct s5p_mfc_variant mfc_drvdata_v10 = { > > + .version = MFC_VERSION_V10, > > + .version_bit = MFC_V10_BIT, > > + .port_num = MFC_NUM_PORTS_V10, > > + .buf_size = &buf_size_v10, > > + .buf_align = &mfc_buf_align_v10, > > + .fw_name[0] = "s5p-mfc-v10.fw", > > Is firmware file publicly available? Sent to firmware repository? Firmware binary is not available publicly. I will check on sending it to firmware repository. > > > +}; > > + > > static const struct of_device_id exynos_mfc_match[] = { > > { > > .compatible = "samsung,mfc-v5", > > @@ -1558,6 +1585,9 @@ static int s5p_mfc_resume(struct device *dev) > > }, { > > .compatible = "samsung,exynos5433-mfc", > > .data = &mfc_drvdata_v8_5433, > > + }, { > > + .compatible = "samsung,mfc-v10", > > + .data = &mfc_drvdata_v10, > > }, > > {}, > > }; > > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h > > index b45d18c..1941c63 100644 > > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h > > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h > > @@ -23,7 +23,7 @@ > > #include <media/v4l2-ioctl.h> > > #include <media/videobuf2-v4l2.h> > > #include "regs-mfc.h" > > -#include "regs-mfc-v8.h" > > +#include "regs-mfc-v10.h" > > > > #define S5P_MFC_NAME "s5p-mfc" > > > > @@ -723,11 +723,13 @@ struct mfc_control { > > #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 MFC_V5_BIT BIT(0) > > #define MFC_V6_BIT BIT(1) > > #define MFC_V7_BIT BIT(2) > > #define MFC_V8_BIT BIT(3) > > +#define MFC_V10_BIT BIT(5) > > I think you can use BIT(4) here. I used BIT(5) in case someone upstreams MFCv9 they can use BIT(4) in order to maintain the sequence order as before. Thank you for the review. Regards, Smitha > > Regards > Andrzej > > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 02/11] [media] s5p-mfc: Adding initial support for MFC v10.10 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-21 20:28 ` Rob Herring 2017-02-06 8:37 ` Smitha T Murthy 1 sibling, 1 reply; 5+ messages in thread From: Rob Herring @ 2017-01-21 20:28 UTC (permalink / raw) To: Smitha T Murthy Cc: devicetree, a.hajda, pankaj.dubey, kamil, krzk, linux-kernel, jtp.park, kyungmin.park, s.nawrocki, m.szyprowski, mchehab, linux-arm-kernel, linux-media On Wed, Jan 18, 2017 at 03:32:00PM +0530, Smitha T Murthy wrote: > Adding the support for MFC v10.10, with new register file and > necessary hw control, decoder, encoder and structural changes. > > CC: Rob Herring <robh+dt@kernel.org> > CC: devicetree@vger.kernel.org > Signed-off-by: Smitha T Murthy <smitha.t@samsung.com> > --- > .../devicetree/bindings/media/s5p-mfc.txt | 1 + > drivers/media/platform/s5p-mfc/regs-mfc-v10.h | 36 ++++++++++++++++ > drivers/media/platform/s5p-mfc/s5p_mfc.c | 30 +++++++++++++ > drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 4 +- > drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 4 ++ > drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 44 +++++++++++--------- > drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 21 +++++---- > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 9 +++- > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 2 + > 9 files changed, 118 insertions(+), 33 deletions(-) > create mode 100644 drivers/media/platform/s5p-mfc/regs-mfc-v10.h > > diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt b/Documentation/devicetree/bindings/media/s5p-mfc.txt > index 2c90128..b70c613 100644 > --- a/Documentation/devicetree/bindings/media/s5p-mfc.txt > +++ b/Documentation/devicetree/bindings/media/s5p-mfc.txt > @@ -13,6 +13,7 @@ Required properties: > (c) "samsung,mfc-v7" for MFC v7 present in Exynos5420 SoC > (d) "samsung,mfc-v8" for MFC v8 present in Exynos5800 SoC > (e) "samsung,exynos5433-mfc" for MFC v8 present in Exynos5433 SoC > + (f) "samsung,mfc-v10" for MFC v10 present in a variant of Exynos7 SoC You are up to v10 in how many SoCs? Please stop with versions and use SoC numbers. It's one thing to use versions when you have many SoCs per version, but that doesn't seem to be happening here. Rob ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 02/11] [media] s5p-mfc: Adding initial support for MFC v10.10 2017-01-21 20:28 ` Rob Herring @ 2017-02-06 8:37 ` Smitha T Murthy 0 siblings, 0 replies; 5+ messages in thread From: Smitha T Murthy @ 2017-02-06 8:37 UTC (permalink / raw) To: Rob Herring Cc: linux-arm-kernel, linux-media, linux-kernel, kyungmin.park, kamil, jtp.park, a.hajda, mchehab, pankaj.dubey, krzk, m.szyprowski, s.nawrocki, devicetree On Sat, 2017-01-21 at 14:28 -0600, Rob Herring wrote: > On Wed, Jan 18, 2017 at 03:32:00PM +0530, Smitha T Murthy wrote: > > Adding the support for MFC v10.10, with new register file and > > necessary hw control, decoder, encoder and structural changes. > > > > CC: Rob Herring <robh+dt@kernel.org> > > CC: devicetree@vger.kernel.org > > Signed-off-by: Smitha T Murthy <smitha.t@samsung.com> > > --- > > .../devicetree/bindings/media/s5p-mfc.txt | 1 + > > drivers/media/platform/s5p-mfc/regs-mfc-v10.h | 36 ++++++++++++++++ > > drivers/media/platform/s5p-mfc/s5p_mfc.c | 30 +++++++++++++ > > drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 4 +- > > drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 4 ++ > > drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 44 +++++++++++--------- > > drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 21 +++++---- > > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 9 +++- > > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 2 + > > 9 files changed, 118 insertions(+), 33 deletions(-) > > create mode 100644 drivers/media/platform/s5p-mfc/regs-mfc-v10.h > > > > diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt b/Documentation/devicetree/bindings/media/s5p-mfc.txt > > index 2c90128..b70c613 100644 > > --- a/Documentation/devicetree/bindings/media/s5p-mfc.txt > > +++ b/Documentation/devicetree/bindings/media/s5p-mfc.txt > > @@ -13,6 +13,7 @@ Required properties: > > (c) "samsung,mfc-v7" for MFC v7 present in Exynos5420 SoC > > (d) "samsung,mfc-v8" for MFC v8 present in Exynos5800 SoC > > (e) "samsung,exynos5433-mfc" for MFC v8 present in Exynos5433 SoC > > + (f) "samsung,mfc-v10" for MFC v10 present in a variant of Exynos7 SoC > > You are up to v10 in how many SoCs? Please stop with versions and use > SoC numbers. It's one thing to use versions when you have many SoCs per > version, but that doesn't seem to be happening here. > > Rob MFCv10.10 is used in Exynos7880. There are other variants of MFCv10 used in Exynos8890 and Exynos7870. I will mention in the next version of patches the SoC name Exynos7880 using MFCv10 on which I have tested. Thank you for the review. Regards, Smitha > > ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-02-06 8:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1484733729-25371-1-git-send-email-smitha.t@samsung.com>
[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
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).