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

Commit a6d76f3f 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: Avoid registering input handler for MDP3 targets"

parents e745aaae f60f5d4f

drivers/video/msm/mdss/mdp3_ctrl.c

+1 −0
Original line number Diff line number Diff line
@@ -2836,6 +2836,7 @@ int mdp3_ctrl_init(struct msm_fb_data_type *mfd) 
	mdp3_interface->atomic_validate = mdp3_layer_atomic_validate;

	mdp3_interface->lut_update = NULL;

	mdp3_interface->configure_panel = mdp3_update_panel_info;

	mdp3_interface->input_event_handler = NULL;



	mdp3_session = kzalloc(sizeof(struct mdp3_session_data), GFP_KERNEL);

	if (!mdp3_session) {

drivers/video/msm/mdss/mdss_fb.c

+3 −2
Original line number Diff line number Diff line
@@ -1264,8 +1264,9 @@ static int mdss_fb_probe(struct platform_device *pdev) 
	 * an idle event, user space tries to fall back to GPU composition which

	 * can lead to increased load when there are new frames.

	 */

	if ((mfd->panel_info->type == MIPI_CMD_PANEL) ||

	    (mfd->panel_info->type == MIPI_VIDEO_PANEL))

	if (mfd->mdp.input_event_handler &&

		((mfd->panel_info->type == MIPI_CMD_PANEL) ||

		(mfd->panel_info->type == MIPI_VIDEO_PANEL)))

		if (mdss_fb_register_input_handler(mfd))

			pr_err("failed to register input handler\n");