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

Commit 71c47da4 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: Add support to wait for dma_done in pan display"

parents fe515de8 ccd07c50

drivers/video/msm/mdss/mdp3_ctrl.c

+11 −0
Original line number Diff line number Diff line
@@ -1890,6 +1890,17 @@ static void mdp3_ctrl_pan_display(struct msm_fb_data_type *mfd) 
			if (IS_ERR_VALUE(rc))

				goto pan_error;

		}



		if (mdp3_ctrl_get_intf_type(mfd) ==

				MDP3_DMA_OUTPUT_SEL_DSI_CMD) {

			rc = mdp3_session->dma->wait_for_dma(mdp3_session->dma,

					mdp3_session->intf);

			if (!rc && !mdp3_session->first_commit) {

				pr_err("dma done timedout\n");

				goto pan_error;

			}

		}



		rc = mdp3_session->dma->update(mdp3_session->dma,

				(void *)(int)(mfd->iova + offset),

				mdp3_session->intf, NULL,

drivers/video/msm/mdss/mdp3_ppp.c

+1 −1
Original line number Diff line number Diff line
@@ -1713,7 +1713,7 @@ int mdp3_ppp_parse_req(void __user *p, 
			(mfd->panel.type == MDP3_DMA_OUTPUT_SEL_DSI_CMD)) {

		rc = mdp3_session->dma->wait_for_dma(mdp3_session->dma,

					mdp3_session->intf);

		if (rc) {

		if (!rc) {

			pr_err("secure dma done not completed\n");

			goto parse_err_2;

		}