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

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

Merge "mdp3: Enable sw vsync when dma is not active"

parents 3d259da5 4e4e6a27
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -217,7 +217,8 @@ static int mdp3_ctrl_vsync_enable(struct msm_fb_data_type *mfd, int enable)
	 * active or when dsi clocks are currently off
	 */
	if (enable && mdp3_session->status == 1
			&& mdp3_session->vsync_before_commit) {
			&& (mdp3_session->vsync_before_commit ||
			!mdp3_session->intf->active)) {
		mod_timer(&mdp3_session->vsync_timer,
			jiffies + msecs_to_jiffies(mdp3_session->vsync_period));
	} else if (enable && !mdp3_session->clk_on) {
@@ -233,7 +234,8 @@ static int mdp3_ctrl_vsync_enable(struct msm_fb_data_type *mfd, int enable)
void mdp3_vsync_timer_func(unsigned long arg)
{
	struct mdp3_session_data *session = (struct mdp3_session_data *)arg;
	if (session->status == 1 && session->vsync_before_commit) {
	if (session->status == 1 && (session->vsync_before_commit ||
			!session->intf->active)) {
		pr_debug("mdp3_vsync_timer_func trigger\n");
		vsync_notify_handler(session);
		mod_timer(&session->vsync_timer,