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

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

Merge "msm: vidc: use actual bitrate for decoder bw voting"

parents 0b646032 a7679153

drivers/media/platform/msm/vidc/governors/msm_vidc_dyn_gov.c

+2 −2
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ static unsigned long __calculate_decoder(struct vidc_bus_vote_data *d, 
	lcu_per_frame = DIV_ROUND_UP(width, lcu_size) *

		DIV_ROUND_UP(height, lcu_size);



	bitrate = __lut(width, height, fps)->bitrate;

	bitrate = (d->bitrate + 1000000 - 1) / 1000000;



	bins_to_bit_factor = d->work_mode == VIDC_WORK_MODE_1 ?

		FP_INT(0) : FP_INT(4);
@@ -660,7 +660,7 @@ static unsigned long __calculate_encoder(struct vidc_bus_vote_data *d, 
	downscaling_ratio = fp_div(FP_INT(d->input_width * d->input_height),

		FP_INT(d->output_width * d->output_height));

	downscaling_ratio = max(downscaling_ratio, FP_ONE);

	bitrate = d->bitrate > 0 ? d->bitrate / 1000000 :

	bitrate = d->bitrate > 0 ? (d->bitrate + 1000000 - 1) / 1000000 :

		__lut(width, height, fps)->bitrate;

	lcu_size = d->lcu_size;

	lcu_per_frame = DIV_ROUND_UP(width, lcu_size) *

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

+3 −0
Original line number Diff line number Diff line
@@ -302,6 +302,9 @@ int msm_comm_vote_bus(struct msm_vidc_core *core) 
				vote_data[i].bitrate = vote_data[i].bitrate /

				inst->prop.fps * vote_data[i].fps;

			}

		} else if (inst->session_type == MSM_VIDC_DECODER) {

			vote_data[i].bitrate =

				filled_len * vote_data[i].fps * 8;

		}



		vote_data[i].power_mode = 0;