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

Commit 72fb984c 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: replace init_completion with reinit_completion"

parents 3a457c3a 52b7f18d

drivers/video/fbdev/msm/mdp3_ctrl.c

+2 −2
Original line number Diff line number Diff line
@@ -1524,7 +1524,7 @@ static int mdp3_ctrl_display_commit_kickoff(struct msm_fb_data_type *mfd, 
			}

		}

		mdp3_session->dma_active = 1;

		init_completion(&mdp3_session->dma_completion);

		reinit_completion(&mdp3_session->dma_completion);

		mdp3_ctrl_notify(mdp3_session, MDP_NOTIFY_FRAME_FLUSHED);

		mdp3_bufq_push(&mdp3_session->bufq_out, data);

	}
@@ -1673,7 +1673,7 @@ static void mdp3_ctrl_pan_display(struct msm_fb_data_type *mfd) 
			}

		}

		mdp3_session->dma_active = 1;

		init_completion(&mdp3_session->dma_completion);

		reinit_completion(&mdp3_session->dma_completion);

		mdp3_ctrl_notify(mdp3_session, MDP_NOTIFY_FRAME_FLUSHED);

	} else {

		pr_debug("mdp3_ctrl_pan_display no memory, stop interface");

drivers/video/fbdev/msm/mdp3_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -1056,7 +1056,7 @@ static int mdp3_dma_stop(struct mdp3_dma *dma, struct mdp3_intf *intf) 
	MDP3_REG_WRITE(MDP3_REG_INTR_ENABLE, 0);

	MDP3_REG_WRITE(MDP3_REG_INTR_CLEAR, 0xfffffff);



	init_completion(&dma->dma_comp);

	reinit_completion(&dma->dma_comp);

	dma->vsync_client.handler = NULL;

	return ret;

}