From 1eded1dfdc00d64ffea170aa843b56193aed0ab1 Mon Sep 17 00:00:00 2001 From: Ayoung Sim Date: Mon, 16 Jul 2018 18:23:08 +0900 Subject: [PATCH] [COMMON] media: mfc: change to exclusive name Change-Id: I47c92c48d88fe8be3acdfc30537a8c7902944057 Signed-off-by: Ayoung Sim --- drivers/media/platform/exynos/mfc/mfc.c | 4 ++-- drivers/media/platform/exynos/mfc/mfc_data_struct.h | 2 +- drivers/media/platform/exynos/mfc/mfc_dec_v4l2.c | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/media/platform/exynos/mfc/mfc.c b/drivers/media/platform/exynos/mfc/mfc.c index 192c8265f4cc..5c82931fb89f 100644 --- a/drivers/media/platform/exynos/mfc/mfc.c +++ b/drivers/media/platform/exynos/mfc/mfc.c @@ -100,7 +100,7 @@ static void __mfc_deinit_dec_ctx(struct mfc_ctx *ctx) mfc_delete_queue(&ctx->dst_buf_nal_queue); mfc_delete_queue(&ctx->ref_buf_queue); - mfc_mem_cleanup_user_shared_handle(ctx, &dec->sh_handle); + mfc_mem_cleanup_user_shared_handle(ctx, &dec->sh_handle_dpb); mfc_mem_cleanup_user_shared_handle(ctx, &dec->sh_handle_hdr); kfree(dec->hdr10_plus_info); kfree(dec->ref_info); @@ -166,7 +166,7 @@ static int __mfc_init_dec_ctx(struct mfc_ctx *ctx) mfc_clear_assigned_dpb(ctx); /* sh_handle: released dpb info */ - dec->sh_handle.fd = -1; + dec->sh_handle_dpb.fd = -1; dec->ref_info = kzalloc( (sizeof(struct dec_dpb_ref_info) * MFC_MAX_DPBS), GFP_KERNEL); if (!dec->ref_info) { diff --git a/drivers/media/platform/exynos/mfc/mfc_data_struct.h b/drivers/media/platform/exynos/mfc/mfc_data_struct.h index d5d37927f134..464acfd2e00b 100644 --- a/drivers/media/platform/exynos/mfc/mfc_data_struct.h +++ b/drivers/media/platform/exynos/mfc/mfc_data_struct.h @@ -1351,7 +1351,7 @@ struct mfc_dec { struct dec_dpb_ref_info *ref_info; int assigned_fd[MFC_MAX_DPBS]; - struct mfc_user_shared_handle sh_handle; + struct mfc_user_shared_handle sh_handle_dpb; struct mfc_user_shared_handle sh_handle_hdr; struct hdr10_plus_meta *hdr10_plus_info; diff --git a/drivers/media/platform/exynos/mfc/mfc_dec_v4l2.c b/drivers/media/platform/exynos/mfc/mfc_dec_v4l2.c index 3533ea28c071..c665fcfc5898 100644 --- a/drivers/media/platform/exynos/mfc/mfc_dec_v4l2.c +++ b/drivers/media/platform/exynos/mfc/mfc_dec_v4l2.c @@ -770,9 +770,9 @@ static int mfc_dec_dqbuf(struct file *file, void *priv, struct v4l2_buffer *buf) buf->index, srcBuf->dpb[ncount].fd[0]); } - if (dec->sh_handle.vaddr != NULL) { + if (dec->sh_handle_dpb.vaddr != NULL) { dstBuf = (struct dec_dpb_ref_info *) - dec->sh_handle.vaddr + buf->index; + dec->sh_handle_dpb.vaddr + buf->index; memcpy(dstBuf, srcBuf, sizeof(struct dec_dpb_ref_info)); dstBuf->index = buf->index; } @@ -1085,12 +1085,12 @@ static int mfc_dec_s_ctrl(struct file *file, void *priv, mfc_err_dev("[DPB] is_dynamic_dpb is 0. it has to be enabled\n"); break; case V4L2_CID_MPEG_MFC_SET_USER_SHARED_HANDLE: - if (dec->sh_handle.fd == -1) { - dec->sh_handle.fd = ctrl->value; - if (mfc_mem_get_user_shared_handle(ctx, &dec->sh_handle)) + if (dec->sh_handle_dpb.fd == -1) { + dec->sh_handle_dpb.fd = ctrl->value; + if (mfc_mem_get_user_shared_handle(ctx, &dec->sh_handle_dpb)) return -EINVAL; mfc_debug(2, "[MEMINFO][DPB] shared handle fd: %d, vaddr: 0x%p\n", - dec->sh_handle.fd, dec->sh_handle.vaddr); + dec->sh_handle_dpb.fd, dec->sh_handle_dpb.vaddr); } break; case V4L2_CID_MPEG_MFC_SET_BUF_PROCESS_TYPE: -- 2.20.1