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

Commit 878f11b4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: add support for pluggable interface"

parents 9ccad203 326d5a5b

drivers/video/msm/mdss/mdss_fb.c

+3 −2
Original line number Diff line number Diff line
@@ -540,13 +540,14 @@ static ssize_t mdss_fb_get_panel_info(struct device *dev, 
			"pu_en=%d\nxstart=%d\nwalign=%d\nystart=%d\nhalign=%d\n"

			"min_w=%d\nmin_h=%d\nroi_merge=%d\ndyn_fps_en=%d\n"

			"min_fps=%d\nmax_fps=%d\npanel_name=%s\n"

			"primary_panel=%d\n",

			"primary_panel=%d\nis_pluggable=%d\n",

			pinfo->partial_update_enabled, pinfo->xstart_pix_align,

			pinfo->width_pix_align, pinfo->ystart_pix_align,

			pinfo->height_pix_align, pinfo->min_width,

			pinfo->min_height, pinfo->partial_update_roi_merge,

			pinfo->dynamic_fps, pinfo->min_fps, pinfo->max_fps,

			pinfo->panel_name, pinfo->is_prim_panel);

			pinfo->panel_name, pinfo->is_prim_panel,

			pinfo->is_pluggable);



	return ret;

}

drivers/video/msm/mdss/mdss_hdmi_tx.c

+1 −0
Original line number Diff line number Diff line
@@ -1593,6 +1593,7 @@ static int hdmi_tx_init_panel_info(struct hdmi_tx_ctrl *hdmi_ctrl) 
	pinfo->lcdc.hsync_skew = 0;



	pinfo->cont_splash_enabled = hdmi_ctrl->pdata.cont_splash_enabled;

	pinfo->is_pluggable = true;



	return 0;

} /* hdmi_tx_init_panel_info */

drivers/video/msm/mdss/mdss_panel.h

+1 −0
Original line number Diff line number Diff line
@@ -613,6 +613,7 @@ struct mdss_panel_info { 
	u32 lm_widths[2];



	bool is_prim_panel;

	bool is_pluggable;



	/* refer sim_panel_modes enum for different modes */

	u8 sim_panel_mode;