Merge "msm: vidc: refine BW voting for rotate/DS/P010" (b2ce3a4a) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+22 −9

Original line number	Diff line number	Diff line
		@@ -367,7 +367,7 @@ static unsigned long __calculate_decoder(struct vidc_bus_vote_data *d,

		fp_t bins_to_bit_factor, vsp_read_factor, vsp_write_factor,
		dpb_factor, dpb_write_factor,
		y_bw_no_ubwc_8bpp, y_bw_no_ubwc_10bpp,
		y_bw_no_ubwc_8bpp, y_bw_no_ubwc_10bpp, y_bw_10bpp_p010,
		motion_vector_complexity = 0;
		fp_t dpb_total = 0;

		@@ -475,6 +475,7 @@ static unsigned long __calculate_decoder(struct vidc_bus_vote_data *d,
		FP_INT(1000 * 1000));
		y_bw_no_ubwc_10bpp = fp_div(fp_mult(y_bw_no_ubwc_8bpp, FP_INT(256)),
		FP_INT(192));
		y_bw_10bpp_p010 = y_bw_no_ubwc_8bpp * 2;

		ddr.dpb_read = dpb_bpp == 8 ? y_bw_no_ubwc_8bpp : y_bw_no_ubwc_10bpp;
		ddr.dpb_read = fp_div(fp_mult(ddr.dpb_read,
		@@ -496,7 +497,8 @@ static unsigned long __calculate_decoder(struct vidc_bus_vote_data *d,

		ddr.opb_read = FP_ZERO;
		ddr.opb_write = unified_dpb_opb ? FP_ZERO : (dpb_bpp == 8 ?
		y_bw_no_ubwc_8bpp : y_bw_no_ubwc_10bpp);
		y_bw_no_ubwc_8bpp : (opb_compression_enabled ?
		y_bw_no_ubwc_10bpp : y_bw_10bpp_p010));
		ddr.opb_write = fp_div(fp_mult(dpb_factor, ddr.opb_write),
		fp_mult(dpb_opb_scaling_ratio, opb_write_compression_factor));

		@@ -618,8 +620,9 @@ static unsigned long __calculate_encoder(struct vidc_bus_vote_data *d,
		fp_t bins_to_bit_factor, dpb_compression_factor,
		original_compression_factor,
		original_compression_factor_y,
		y_bw_no_ubwc_8bpp, y_bw_no_ubwc_10bpp,
		y_bw_no_ubwc_8bpp, y_bw_no_ubwc_10bpp, y_bw_10bpp_p010,
		input_compression_factor,
		downscaling_ratio,
		ref_y_read_bw_factor, ref_cbcr_read_bw_factor,
		recon_write_bw_factor, mese_read_factor,
		total_ref_read_crcb,
		@@ -642,7 +645,7 @@ static unsigned long __calculate_encoder(struct vidc_bus_vote_data *d,
		} llc = {0};

		/* Encoder Parameters setup */
		rotation = false;
		rotation = d->rotation;
		cropping_or_scaling = false;
		vertical_tile_width = 960;
		recon_write_bw_factor = FP(1, 8, 100);
		@@ -652,8 +655,11 @@ static unsigned long __calculate_encoder(struct vidc_bus_vote_data *d,

		/* Derived Parameters */
		fps = d->fps;
		width = max(d->input_width, BASELINE_DIMENSIONS.width);
		height = max(d->input_height, BASELINE_DIMENSIONS.height);
		width = max(d->output_width, BASELINE_DIMENSIONS.width);
		height = max(d->output_height, BASELINE_DIMENSIONS.height);
		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 :
		__lut(width, height, fps)->bitrate;
		lcu_size = d->lcu_size;
		@@ -666,6 +672,7 @@ static unsigned long __calculate_encoder(struct vidc_bus_vote_data *d,
		FP_INT(1000 * 1000));
		y_bw_no_ubwc_10bpp = fp_div(fp_mult(y_bw_no_ubwc_8bpp,
		FP_INT(256)), FP_INT(192));
		y_bw_10bpp_p010 = y_bw_no_ubwc_8bpp * 2;

		b_frames_enabled = d->b_frames_enabled;
		original_color_format = d->num_formats >= 1 ?
		@@ -772,9 +779,13 @@ static unsigned long __calculate_encoder(struct vidc_bus_vote_data *d,
		(recon_write_bw_factor - FP_ONE)),
		recon_write_bw_factor);

		ddr.orig_read = dpb_bpp == 8 ? y_bw_no_ubwc_8bpp : y_bw_no_ubwc_10bpp;
		ddr.orig_read = fp_div(fp_mult(ddr.orig_read, FP(1, 50, 100)),
		original_compression_factor);
		ddr.orig_read = dpb_bpp == 8 ? y_bw_no_ubwc_8bpp :
		(original_compression_enabled ? y_bw_no_ubwc_10bpp :
		y_bw_10bpp_p010);
		ddr.orig_read = fp_div(fp_mult(fp_mult(ddr.orig_read, FP(1, 50, 100)),
		downscaling_ratio), original_compression_factor);
		if (rotation == 90 \|\| rotation == 270)
		ddr.orig_read *= lcu_size == 32 ? (dpb_bpp == 8 ? 1 : 3) : 2;

		ddr.line_buffer_read = FP_INT(tnbr_per_lcu * lcu_per_frame *
		fps / bps(1));
		@@ -814,6 +825,8 @@ static unsigned long __calculate_encoder(struct vidc_bus_vote_data *d,
		{"width", "%d", width},
		{"height", "%d", height},
		{"fps", "%d", fps},
		{"dpb bitdepth", "%d", dpb_bpp},
		{"input downscaling ratio", DUMP_FP_FMT, downscaling_ratio},
		{"rotation", "%d", rotation},
		{"cropping or scaling", "%d", cropping_or_scaling},
		{"low power mode", "%d", low_power},

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

+6 −9

Original line number	Diff line number	Diff line
		@@ -289,15 +289,12 @@ int msm_comm_vote_bus(struct msm_vidc_core *core)

		vote_data[i].domain = get_hal_domain(inst->session_type);
		vote_data[i].codec = get_hal_codec(codec);
		vote_data[i].input_width = max(inst->prop.width[OUTPUT_PORT],
		inst->prop.width[OUTPUT_PORT]);
		vote_data[i].input_height = max(inst->prop.height[OUTPUT_PORT],
		inst->prop.height[OUTPUT_PORT]);
		vote_data[i].output_width = max(inst->prop.width[CAPTURE_PORT],
		inst->prop.width[OUTPUT_PORT]);
		vote_data[i].output_height =
		max(inst->prop.height[CAPTURE_PORT],
		inst->prop.height[OUTPUT_PORT]);
		vote_data[i].input_width = inst->prop.width[OUTPUT_PORT];
		vote_data[i].input_height = inst->prop.height[OUTPUT_PORT];
		vote_data[i].output_width = inst->prop.width[CAPTURE_PORT];
		vote_data[i].output_height = inst->prop.height[CAPTURE_PORT];
		vote_data[i].rotation =
		msm_comm_g_ctrl_for_id(inst, V4L2_CID_ROTATE);
		vote_data[i].lcu_size = (codec == V4L2_PIX_FMT_HEVC \|\|
		codec == V4L2_PIX_FMT_VP9) ? 32 : 16;
		vote_data[i].b_frames_enabled =

drivers/media/platform/msm/vidc/vidc_hfi_api.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -1397,6 +1397,7 @@ struct vidc_bus_vote_data {
		int num_formats; /* 1 = DPB-OPB unified; 2 = split */
		int input_height, input_width, fps, bitrate;
		int output_height, output_width;
		int rotation;
		int compression_ratio;
		int complexity_factor;
		int input_cr;