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

Commit 4b475d4a authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: correct CVP usecase bandwidth calculations"

parents c595ea51 d4296775

drivers/media/platform/msm/vidc/msm_cvp.c

+3 −2
Original line number Diff line number Diff line
@@ -304,8 +304,9 @@ static int msm_cvp_request_power(struct msm_vidc_inst *inst, 


	inst->clk_data.min_freq = max(power->clock_cycles_a,

		power->clock_cycles_b);

	inst->clk_data.ddr_bw = power->ddr_bw;

	inst->clk_data.sys_cache_bw = power->sys_cache_bw;

	/* convert client provided bps into kbps as expected by driver */

	inst->clk_data.ddr_bw = power->ddr_bw / 1000;

	inst->clk_data.sys_cache_bw = power->sys_cache_bw / 1000;

	rc = msm_cvp_scale_clocks_and_bus(inst);

	if (rc) {

		dprintk(VIDC_ERR,

drivers/media/platform/msm/vidc/msm_vidc_clocks.c

+4 −2
Original line number Diff line number Diff line
@@ -300,8 +300,10 @@ int msm_comm_vote_bus(struct msm_vidc_core *core) 
		vote_data[i].fps = msm_vidc_get_fps(inst);



		vote_data[i].power_mode = 0;

		if (msm_vidc_clock_voting || is_turbo ||

			inst->clk_data.buffer_counter < DCVS_FTB_WINDOW)

		if (inst->clk_data.buffer_counter < DCVS_FTB_WINDOW &&

			inst->session_type != MSM_VIDC_CVP)

			vote_data[i].power_mode = VIDC_POWER_TURBO;

		if (msm_vidc_clock_voting || is_turbo)

			vote_data[i].power_mode = VIDC_POWER_TURBO;



		if (msm_comm_get_stream_output_mode(inst) ==