Merge "msm: mdss: send fb events for both pdata for split DSI cases" (9716b4dc) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/video/msm/mdss/mdss_dsi.c

+7 −11

Original line number	Diff line number	Diff line
		@@ -882,20 +882,16 @@ static int mdss_dsi_debugfs_setup(struct mdss_panel_data *pdata,

		static int mdss_dsi_debugfs_init(struct mdss_dsi_ctrl_pdata *ctrl_pdata)
		{
		struct mdss_panel_data *pdata = &ctrl_pdata->panel_data;
		int rc;

		do {
		struct mdss_panel_data *pdata = &ctrl_pdata->panel_data;
		struct mdss_panel_info panel_info = pdata->panel_info;
		rc = mdss_dsi_debugfs_setup(pdata,
		panel_info.debugfs_info->root);

		rc = mdss_dsi_debugfs_setup(pdata, panel_info.debugfs_info->root);
		if (rc) {
		pr_err("%s: Error in initilizing dsi ctrl debugfs\n",
		__func__);
		return rc;
		}
		pdata = pdata->next;
		} while (pdata);

		pr_debug("%s: Initialized mdss_dsi_debugfs_init\n", __func__);
		return 0;

+8 −3

Original line number	Diff line number	Diff line
		@@ -1210,6 +1210,7 @@ static int mdss_fb_remove(struct platform_device *pdev)
		static int mdss_fb_send_panel_event(struct msm_fb_data_type *mfd,
		int event, void *arg)
		{
		int ret = 0;
		struct mdss_panel_data *pdata;

		pdata = dev_get_platdata(&mfd->pdev->dev);
		@@ -1220,10 +1221,14 @@ static int mdss_fb_send_panel_event(struct msm_fb_data_type *mfd,

		pr_debug("sending event=%d for fb%d\n", event, mfd->index);

		do {
		if (pdata->event_handler)
		return pdata->event_handler(pdata, event, arg);
		ret = pdata->event_handler(pdata, event, arg);

		return 0;
		pdata = pdata->next;
		} while (!ret && pdata);

		return ret;
		}

		static int mdss_fb_suspend_sub(struct msm_fb_data_type *mfd)