From 408a8050fb2319991bd5e9432f82e1986d4c5194 Mon Sep 17 00:00:00 2001 From: Akshata Sahukar Date: Fri, 16 Aug 2019 12:06:11 -0700 Subject: [PATCH] msm: vidc: Add support to disable CVP usage Add support to disable overall CVP usage. Change-Id: I82e7a3e6533008b29f0beafba61fa7b6906aab53 Signed-off-by: Akshata Sahukar --- msm/vidc/msm_venc.c | 3 +++ msm/vidc/msm_vidc_common.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/msm/vidc/msm_venc.c b/msm/vidc/msm_venc.c index 4b2cc1495bba..c2a2c19ff0a0 100644 --- a/msm/vidc/msm_venc.c +++ b/msm/vidc/msm_venc.c @@ -4184,6 +4184,9 @@ int msm_venc_set_extradata(struct msm_vidc_inst *inst) } } + if(!msm_vidc_cvp_usage) + inst->prop.extradata_ctrls &= ~EXTRADATA_ENC_INPUT_CVP; + /* CVP extradata is common between user space and external CVP kernel to kernel. Hence, skipping here and will be set after msm_vidc_prepare_preprocess in start_streaming*/ diff --git a/msm/vidc/msm_vidc_common.c b/msm/vidc/msm_vidc_common.c index bb52869c5fbc..5cb580239fb6 100644 --- a/msm/vidc/msm_vidc_common.c +++ b/msm/vidc/msm_vidc_common.c @@ -4220,7 +4220,7 @@ static void populate_frame_data(struct vidc_frame_data *data, if (vbuf->flags & V4L2_BUF_FLAG_CODECCONFIG) data->flags |= HAL_BUFFERFLAG_CODECCONFIG; - if(vbuf->flags & V4L2_BUF_FLAG_CVPMETADATA_SKIP) + if(msm_vidc_cvp_usage && (vbuf->flags & V4L2_BUF_FLAG_CVPMETADATA_SKIP)) data->flags |= HAL_BUFFERFLAG_CVPMETADATA_SKIP; msm_comm_fetch_input_tag(&inst->etb_data, vb->index,