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

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

Merge "fbdev: msm: Call vsync_handler only after ctl start"

parents a417d8a7 3dd5febe

drivers/video/fbdev/msm/mdss_mdp_overlay.c

+8 −6
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -5762,12 +5762,14 @@ static int mdss_mdp_overlay_on(struct msm_fb_data_type *mfd) 


panel_on:

	if (mdp5_data->vsync_en) {

		if ((ctl) && (ctl->ops.add_vsync_handler)) {

			pr_info("reenabling vsync for fb%d\n", mfd->index);

			mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON);

		rc = ctl->ops.add_vsync_handler(ctl, &ctl->vsync_handler);

			rc = ctl->ops.add_vsync_handler(ctl,

					 &ctl->vsync_handler);

			mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF);

		}



	}

	if (IS_ERR_VALUE(rc)) {

		pr_err("Failed to turn on fb%d\n", mfd->index);

		mdss_mdp_overlay_off(mfd);