diff options
Diffstat (limited to 'drivers/media/video/samsung/mfc5x/mfc_inst.c')
| -rw-r--r-- | drivers/media/video/samsung/mfc5x/mfc_inst.c | 59 |
1 files changed, 31 insertions, 28 deletions
diff --git a/drivers/media/video/samsung/mfc5x/mfc_inst.c b/drivers/media/video/samsung/mfc5x/mfc_inst.c index ef0d0e0..33736c9 100644 --- a/drivers/media/video/samsung/mfc5x/mfc_inst.c +++ b/drivers/media/video/samsung/mfc5x/mfc_inst.c @@ -55,6 +55,9 @@ struct mfc_inst_ctx *mfc_create_inst(void) #ifdef CONFIG_BUSFREQ ctx->busfreq_flag = false; #endif +#if defined(CONFIG_MACH_GC1) && defined(CONFIG_EXYNOS4_CPUFREQ) + ctx->cpufreq_flag = false; +#endif #if defined(CONFIG_CPU_EXYNOS4210) && defined(CONFIG_EXYNOS4_CPUFREQ) ctx->cpufreq_flag = false; #endif @@ -193,34 +196,34 @@ int mfc_set_inst_cfg(struct mfc_inst_ctx *ctx, int type, void *arg) } switch (type) { - case MFC_DEC_SETCONF_POST_ENABLE: - case MFC_DEC_SETCONF_EXTRA_BUFFER_NUM: - case MFC_DEC_SETCONF_DISPLAY_DELAY: - case MFC_DEC_SETCONF_IS_LAST_FRAME: - case MFC_DEC_SETCONF_SLICE_ENABLE: - case MFC_DEC_SETCONF_CRC_ENABLE: - case MFC_DEC_SETCONF_FIMV1_WIDTH_HEIGHT: - case MFC_DEC_SETCONF_FRAME_TAG: - case MFC_DEC_SETCONF_IMMEDIATELY_DISPLAY: - case MFC_DEC_SETCONF_DPB_FLUSH: - case MFC_DEC_SETCONF_SEI_PARSE: - case MFC_DEC_SETCONF_PIXEL_CACHE: - case MFC_ENC_SETCONF_FRAME_TYPE: - case MFC_ENC_SETCONF_CHANGE_FRAME_RATE: - case MFC_ENC_SETCONF_CHANGE_BIT_RATE: - case MFC_ENC_SETCONF_FRAME_TAG: - case MFC_ENC_SETCONF_ALLOW_FRAME_SKIP: - case MFC_ENC_SETCONF_VUI_INFO: - case MFC_ENC_SETCONF_I_PERIOD: - case MFC_ENC_SETCONF_HIER_P: - case MFC_ENC_SETCONF_SEI_GEN: - case MFC_ENC_SETCONF_FRAME_PACKING: - case MFC_ENC_SETCONF_SPS_PPS_GEN: - if (ctx->c_ops->set_codec_cfg) { - if ((ctx->c_ops->set_codec_cfg(ctx, type, arg)) < 0) - return MFC_SET_CONF_FAIL; - } - break; + case MFC_DEC_SETCONF_POST_ENABLE: + case MFC_DEC_SETCONF_EXTRA_BUFFER_NUM: + case MFC_DEC_SETCONF_DISPLAY_DELAY: + case MFC_DEC_SETCONF_IS_LAST_FRAME: + case MFC_DEC_SETCONF_SLICE_ENABLE: + case MFC_DEC_SETCONF_CRC_ENABLE: + case MFC_DEC_SETCONF_FIMV1_WIDTH_HEIGHT: + case MFC_DEC_SETCONF_FRAME_TAG: + case MFC_DEC_SETCONF_IMMEDIATELY_DISPLAY: + case MFC_DEC_SETCONF_DPB_FLUSH: + case MFC_DEC_SETCONF_SEI_PARSE: + case MFC_DEC_SETCONF_PIXEL_CACHE: + case MFC_ENC_SETCONF_FRAME_TYPE: + case MFC_ENC_SETCONF_CHANGE_FRAME_RATE: + case MFC_ENC_SETCONF_CHANGE_BIT_RATE: + case MFC_ENC_SETCONF_FRAME_TAG: + case MFC_ENC_SETCONF_ALLOW_FRAME_SKIP: + case MFC_ENC_SETCONF_VUI_INFO: + case MFC_ENC_SETCONF_I_PERIOD: + case MFC_ENC_SETCONF_HIER_P: + case MFC_ENC_SETCONF_SEI_GEN: + case MFC_ENC_SETCONF_FRAME_PACKING: + case MFC_ENC_SETCONF_SPS_PPS_GEN: + if (ctx->c_ops->set_codec_cfg) { + if ((ctx->c_ops->set_codec_cfg(ctx, type, arg)) < 0) + return MFC_SET_CONF_FAIL; + } + break; default: mfc_err("invalid set config type: 0x%08x\n", type); |