Merge "msm: mdss: Fix destination bpp on writeback panel" (a8e084c7) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/video/msm/mdss/mdss_mdp_ctl.c

+15 −9

Original line number	Diff line number	Diff line
		@@ -1221,8 +1221,13 @@ static void mdss_mdp_perf_calc_mixer(struct mdss_mdp_mixer *mixer,
		memset(perf, 0, sizeof(*perf));

		if (!mixer->rotator_mode) {
		if (mixer->type == MDSS_MDP_MIXER_TYPE_INTF) {
		pinfo = &mixer->ctl->panel_data->panel_info;
		if (!pinfo) {
		pr_err("pinfo is NULL\n");
		goto exit;
		}

		if (mixer->type == MDSS_MDP_MIXER_TYPE_INTF) {
		if (pinfo->type == MIPI_VIDEO_PANEL) {
		fps = pinfo->panel_max_fps;
		v_total = pinfo->panel_max_vtotal;
		@@ -1230,7 +1235,11 @@ static void mdss_mdp_perf_calc_mixer(struct mdss_mdp_mixer *mixer,
		fps = mdss_panel_get_framerate(pinfo);
		v_total = mdss_panel_get_vtotal(pinfo);
		}
		} else {
		v_total = mixer->height;
		}

		/* For writeback panel, mixer type can be other than intf */
		if (pinfo->type == WRITEBACK_PANEL) {
		fmt = mdss_mdp_get_format_params(
		mixer->ctl->dst_format);
		@@ -1238,9 +1247,6 @@ static void mdss_mdp_perf_calc_mixer(struct mdss_mdp_mixer *mixer,
		bpp = fmt->bpp;
		pinfo = NULL;
		}
		} else {
		v_total = mixer->height;
		}

		perf->mdp_clk_rate = mixer->width * v_total * fps;
		perf->mdp_clk_rate =