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

Commit 7b9c87fa authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "disp: msm: fix rsc static wakeup time calculation"

parents f77b7c53 9a1da8b4

msm/sde/sde_encoder.c

+1 −12
Original line number Diff line number Diff line
@@ -1377,20 +1377,9 @@ static int _sde_encoder_update_rsc_client( 
	    (rsc_config->prefill_lines != mode_info->prefill_lines) ||

	    (rsc_config->jitter_numer != mode_info->jitter_numer) ||

	    (rsc_config->jitter_denom != mode_info->jitter_denom)) {



		rsc_config->fps = mode_info->frame_rate;

		rsc_config->vtotal = mode_info->vtotal;

		/*

		 * for video mode, prefill lines should not go beyond vertical

		 * front porch for RSCC configuration. This will ensure bw

		 * downvotes are not sent within the active region. Additional

		 * -1 is to give one line time for rscc mode min_threshold.

		 */

		if (is_vid_mode && (mode_info->prefill_lines >= v_front_porch))

			rsc_config->prefill_lines = v_front_porch - 1;

		else

		rsc_config->prefill_lines = mode_info->prefill_lines;



		rsc_config->jitter_numer = mode_info->jitter_numer;

		rsc_config->jitter_denom = mode_info->jitter_denom;

		sde_enc->rsc_state_init = false;

msm/sde_rsc.c

+1 −5
Original line number Diff line number Diff line
@@ -331,11 +331,7 @@ static u32 sde_rsc_timer_calculate(struct sde_rsc_priv *rsc, 
	line_time_ns = div_u64(line_time_ns, rsc->cmd_config.vtotal);

	prefill_time_ns = line_time_ns * rsc->cmd_config.prefill_lines;



	/* only take jitter into account for CMD mode */

	if (state == SDE_RSC_CMD_STATE)

	total = frame_time_ns - frame_jitter - prefill_time_ns;

	else

		total = frame_time_ns - prefill_time_ns;



	if (total < 0) {

		pr_err("invalid total time period time:%llu jiter_time:%llu blanking time:%llu\n",