Merge "msm: mdss: fix border configurations for split DSI cases" (21726e44) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/video/msm/mdss/mdss_dsi_panel.c

+13 −0

Original line number	Diff line number	Diff line
		@@ -2108,6 +2108,10 @@ static int mdss_dsi_panel_timing_from_dt(struct device_node *np,
		u32 tmp;
		int rc, i, len;
		const char *data;
		struct mdss_dsi_ctrl_pdata *ctrl_pdata;

		ctrl_pdata = container_of(panel_data, struct mdss_dsi_ctrl_pdata,
		panel_data);

		rc = of_property_read_u32(np, "qcom,mdss-dsi-panel-width", &tmp);
		if (rc) {
		@@ -2144,6 +2148,15 @@ static int mdss_dsi_panel_timing_from_dt(struct device_node *np,
		pt->timing.border_left = !rc ? tmp : 0;
		rc = of_property_read_u32(np, "qcom,mdss-dsi-h-right-border", &tmp);
		pt->timing.border_right = !rc ? tmp : 0;

		/* overriding left/right borders for split display cases */
		if (mdss_dsi_is_hw_config_split(ctrl_pdata->shared_data)) {
		if (panel_data->next)
		pt->timing.border_right = 0;
		else
		pt->timing.border_left = 0;
		}

		rc = of_property_read_u32(np, "qcom,mdss-dsi-v-top-border", &tmp);
		pt->timing.border_top = !rc ? tmp : 0;
		rc = of_property_read_u32(np, "qcom,mdss-dsi-v-bottom-border", &tmp);

+9 −0

Original line number	Diff line number	Diff line
		@@ -488,6 +488,15 @@ static int __configure_pipe_params(struct msm_fb_data_type *mfd,
		pipe->blend_op = layer->blend_op;
		pipe->async_update = (layer->flags & MDP_LAYER_ASYNC) ? true : false;

		if (mixer->ctl) {
		pipe->dst.x += mixer->ctl->border_x_off;
		pipe->dst.y += mixer->ctl->border_y_off;
		}
		pr_debug("src{%d,%d,%d,%d}, dst{%d,%d,%d,%d}, border{%d,%d}\n",
		pipe->src.x, pipe->src.y, pipe->src.w, pipe->src.h,
		pipe->dst.x, pipe->dst.y, pipe->dst.w, pipe->dst.h,
		mixer->ctl->border_x_off, mixer->ctl->border_y_off);

		flags = pipe->flags;
		if (is_single_layer)
		flags \|= PERF_CALC_PIPE_SINGLE_LAYER;