media: s5p-mfc: Rename IS_MFCV8 macro

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>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
index 76119a8cc4778369afa97589c4ecff26970c38ed..91090fc5a55163fc447140d10e4463ff82614844 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
@@ -714,7 +714,7 @@ void s5p_mfc_cleanup_queue(struct list_head *lh, struct vb2_queue *vq);
 #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 f95cd76af537455d6e034e074a2e4aaf5b407950..a1c729c197d305ca5439c21c9876e7e375cbf4fa 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
@@ -399,7 +399,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 8937b0af7cb3fca8788a1229b476aa06b5d4a916..42e9351303a266bd908ebe0a4834af17848f90e1 100644 (file)
--- 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 88dbb9c341ec624dffacf61b45a1734d25a02dd6..fe144799e304e301d46b0c95edc6da0ec84249e5 100644 (file)
--- 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,
@@ -364,7 +364,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;
@@ -445,7 +445,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,
@@ -2109,7 +2109,7 @@ const struct s5p_mfc_regs *s5p_mfc_init_regs_v6_plus(struct s5p_mfc_dev *dev)
                        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.