Merge "msm: mdss: Parse continous splash status entry in panel" (aeb4bd96) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_dsi.c

+7 −21

Original line number	Diff line number	Diff line
		@@ -919,14 +919,13 @@ static int mdss_dsi_ctrl_probe(struct platform_device *pdev)

		cmd_cfg_cont_splash = mdss_panel_get_boot_cfg() ? true : false;

		rc = mdss_dsi_panel_init(dsi_pan_node, ctrl_pdata);
		rc = mdss_dsi_panel_init(dsi_pan_node, ctrl_pdata, cmd_cfg_cont_splash);
		if (rc) {
		pr_err("%s: dsi panel init failed\n", __func__);
		goto error_pan_node;
		}

		rc = dsi_panel_device_register(dsi_pan_node, ctrl_pdata,
		cmd_cfg_cont_splash);
		rc = dsi_panel_device_register(dsi_pan_node, ctrl_pdata);
		if (rc) {
		pr_err("%s: dsi panel dev reg failed\n", __func__);
		goto error_pan_node;
		@@ -1026,8 +1025,7 @@ int mdss_dsi_retrieve_ctrl_resources(struct platform_device *pdev, int mode,
		}

		int dsi_panel_device_register(struct device_node *pan_node,
		struct mdss_dsi_ctrl_pdata *ctrl_pdata,
		bool cmd_cfg_cont_splash)
		struct mdss_dsi_ctrl_pdata *ctrl_pdata)
		{
		struct mipi_panel_info *mipi;
		int rc, i, len;
		@@ -1036,7 +1034,6 @@ int dsi_panel_device_register(struct device_node *pan_node,
		struct device_node *dsi_ctrl_np = NULL;
		struct platform_device *ctrl_pdev = NULL;
		bool dynamic_fps;
		bool cont_splash_enabled = false;
		const char *data;

		mipi = &(pinfo->mipi);
		@@ -1302,22 +1299,9 @@ int dsi_panel_device_register(struct device_node *pan_node,
		ctrl_pdata->pclk_rate, ctrl_pdata->byte_clk_rate);

		ctrl_pdata->ctrl_state = CTRL_STATE_UNKNOWN;
		if (cmd_cfg_cont_splash)
		cont_splash_enabled = of_property_read_bool(pan_node,
		"qcom,cont-splash-enabled");
		else
		cont_splash_enabled = false;
		if (!cont_splash_enabled) {
		pr_info("%s:%d Continuous splash flag not found.\n",
		__func__, __LINE__);
		ctrl_pdata->panel_data.panel_info.cont_splash_enabled = 0;
		ctrl_pdata->panel_data.panel_info.panel_power_on = 0;
		} else {
		pr_info("%s:%d Continuous splash flag enabled.\n",
		__func__, __LINE__);

		ctrl_pdata->panel_data.panel_info.cont_splash_enabled = 1;
		ctrl_pdata->panel_data.panel_info.panel_power_on = 1;
		if (pinfo->cont_splash_enabled) {
		pinfo->panel_power_on = 1;
		rc = mdss_dsi_panel_power_on(&(ctrl_pdata->panel_data), 1);
		if (rc) {
		pr_err("%s: Panel power on failed\n", __func__);
		@@ -1327,6 +1311,8 @@ int dsi_panel_device_register(struct device_node *pan_node,
		mdss_dsi_clk_ctrl(ctrl_pdata, 1);
		ctrl_pdata->ctrl_state \|=
		(CTRL_STATE_PANEL_INIT \| CTRL_STATE_MDP_ACTIVE);
		} else {
		pinfo->panel_power_on = 0;
		}

		rc = mdss_register_panel(ctrl_pdev, &(ctrl_pdata->panel_data));

drivers/video/msm/mdss/mdss_dsi.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -365,8 +365,7 @@ struct mdss_dsi_ctrl_pdata {
		};

		int dsi_panel_device_register(struct device_node *pan_node,
		struct mdss_dsi_ctrl_pdata *ctrl_pdata,
		bool cmd_cfg_cont_splash);
		struct mdss_dsi_ctrl_pdata *ctrl_pdata);

		char mdss_dsi_buf_reserve_hdr(struct dsi_buf dp, int hlen);
		char mdss_dsi_buf_init(struct dsi_buf dp);
		@@ -425,5 +424,6 @@ struct dcs_cmd_req mdss_dsi_cmdlist_get(struct mdss_dsi_ctrl_pdata ctrl);
		void mdss_dsi_cmdlist_kickoff(int intf);

		int mdss_dsi_panel_init(struct device_node *node,
		struct mdss_dsi_ctrl_pdata *ctrl_pdata);
		struct mdss_dsi_ctrl_pdata *ctrl_pdata,
		bool cmd_cfg_cont_splash);
		#endif /* MDSS_DSI_H */

drivers/video/msm/mdss/mdss_dsi_panel.c

+19 −1

Original line number	Diff line number	Diff line
		@@ -761,10 +761,12 @@ error:
		}

		int mdss_dsi_panel_init(struct device_node *node,
		struct mdss_dsi_ctrl_pdata *ctrl_pdata)
		struct mdss_dsi_ctrl_pdata *ctrl_pdata,
		bool cmd_cfg_cont_splash)
		{
		int rc = 0;
		static const char *panel_name;
		bool cont_splash_enabled;

		if (!node) {
		pr_err("%s: no panel node\n", __func__);
		@@ -785,6 +787,22 @@ int mdss_dsi_panel_init(struct device_node *node,
		return rc;
		}

		if (cmd_cfg_cont_splash)
		cont_splash_enabled = of_property_read_bool(node,
		"qcom,cont-splash-enabled");
		else
		cont_splash_enabled = false;
		if (!cont_splash_enabled) {
		pr_info("%s:%d Continuous splash flag not found.\n",
		__func__, __LINE__);
		ctrl_pdata->panel_data.panel_info.cont_splash_enabled = 0;
		} else {
		pr_info("%s:%d Continuous splash flag enabled.\n",
		__func__, __LINE__);

		ctrl_pdata->panel_data.panel_info.cont_splash_enabled = 1;
		}

		ctrl_pdata->on = mdss_dsi_panel_on;
		ctrl_pdata->off = mdss_dsi_panel_off;
		ctrl_pdata->panel_data.set_backlight = mdss_dsi_panel_bl_ctrl;