Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4957c0a7 authored by Chinmay Sawarkar's avatar Chinmay Sawarkar
Browse files

msm: vidc: Update cycle count for vpx 



VPx cycle requirement is not same as CABAC.
Hence update required as per system recommendation.

CRs-Fixed: 2560714
Change-Id: If600bc9c4abb364dba5f807c944976be992567c9
Signed-off-by: default avatarChinmay Sawarkar <chinmays@codeaurora.org>
parent 974b3362

msm/vidc/msm_vidc_clocks.c

+10 −2
Original line number Diff line number Diff line
@@ -729,6 +729,7 @@ static unsigned long msm_vidc_calc_freq_iris2(struct msm_vidc_inst *inst, 
	struct clock_data *dcvs = NULL;

	u32 operating_rate, vsp_factor_num = 1, vsp_factor_den = 1;

	u32 base_cycles = 0;

	u32 codec = 0;



	core = inst->core;

	dcvs = &inst->clk_data;
@@ -781,8 +782,11 @@ static unsigned long msm_vidc_calc_freq_iris2(struct msm_vidc_inst *inst, 
		vsp_cycles = div_u64(((u64)inst->clk_data.bitrate *

					vsp_factor_num), vsp_factor_den);



		codec = get_v4l2_codec(inst);

		base_cycles = inst->clk_data.entry->vsp_cycles;

		if (inst->entropy_mode == HFI_H264_ENTROPY_CABAC) {

		if (codec == V4L2_PIX_FMT_VP8 || codec == V4L2_PIX_FMT_VP9) {

			vsp_cycles = div_u64(vsp_cycles * 170, 100);

		} else if (inst->entropy_mode == HFI_H264_ENTROPY_CABAC) {

			vsp_cycles = div_u64(vsp_cycles * 135, 100);

		} else {

			base_cycles = 0;
@@ -807,9 +811,13 @@ static unsigned long msm_vidc_calc_freq_iris2(struct msm_vidc_inst *inst, 
			vpp_cycles += div_u64(vpp_cycles * 59, 1000);



		/* VSP */

		codec = get_v4l2_codec(inst);

		base_cycles = inst->clk_data.entry->vsp_cycles;

		vsp_cycles = fps * filled_len * 8;

		if (inst->entropy_mode == HFI_H264_ENTROPY_CABAC) {



		if (codec == V4L2_PIX_FMT_VP8 || codec == V4L2_PIX_FMT_VP9) {

			vsp_cycles = div_u64(vsp_cycles * 170, 100);

		} else if (inst->entropy_mode == HFI_H264_ENTROPY_CABAC) {

			vsp_cycles = div_u64(vsp_cycles * 135, 100);

		} else {

			base_cycles = 0;

msm/vidc/msm_vidc_platform.c

+3 −3
Original line number Diff line number Diff line
@@ -80,13 +80,13 @@ static struct msm_vidc_codec_data lito_codec_data[] = { 
static struct msm_vidc_codec_data kona_codec_data[] =  {

	CODEC_ENTRY(V4L2_PIX_FMT_H264, MSM_VIDC_ENCODER, 25, 675, 320),

	CODEC_ENTRY(V4L2_PIX_FMT_HEVC, MSM_VIDC_ENCODER, 25, 675, 320),

	CODEC_ENTRY(V4L2_PIX_FMT_VP8, MSM_VIDC_ENCODER, 25, 675, 320),

	CODEC_ENTRY(V4L2_PIX_FMT_VP8, MSM_VIDC_ENCODER, 60, 675, 320),

	CODEC_ENTRY(V4L2_PIX_FMT_TME, MSM_VIDC_ENCODER, 25, 540, 540),

	CODEC_ENTRY(V4L2_PIX_FMT_MPEG2, MSM_VIDC_DECODER, 25, 200, 200),

	CODEC_ENTRY(V4L2_PIX_FMT_H264, MSM_VIDC_DECODER, 25, 200, 200),

	CODEC_ENTRY(V4L2_PIX_FMT_HEVC, MSM_VIDC_DECODER, 25, 200, 200),

	CODEC_ENTRY(V4L2_PIX_FMT_VP8, MSM_VIDC_DECODER, 25, 200, 200),

	CODEC_ENTRY(V4L2_PIX_FMT_VP9, MSM_VIDC_DECODER, 25, 200, 200),

	CODEC_ENTRY(V4L2_PIX_FMT_VP8, MSM_VIDC_DECODER, 60, 200, 200),

	CODEC_ENTRY(V4L2_PIX_FMT_VP9, MSM_VIDC_DECODER, 60, 200, 200),

};



/* Update with SM6150 data */