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

Commit 7db7a90e 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: handle get buffer failure gracefully"

parents 2d07aa47 1e51ff73

drivers/video/msm/mdss/mdss_mdp_overlay.c

+2 −1
Original line number Diff line number Diff line
@@ -1673,7 +1673,8 @@ static int mdss_mdp_overlay_queue(struct msm_fb_data_type *mfd, 
	if (IS_ERR_VALUE(ret)) {

		pr_err("src_data pmem error\n");

	}

	pipe->has_buf = 1;



	pipe->has_buf = !ret;



	mdss_mdp_pipe_unmap(pipe);

drivers/video/msm/mdss/mdss_mdp_pipe.c

+5 −5
Original line number Diff line number Diff line
@@ -1443,7 +1443,8 @@ int mdss_mdp_pipe_queue_data(struct mdss_mdp_pipe *pipe, 
		((pipe->type == MDSS_MDP_PIPE_TYPE_DMA) &&

		 (pipe->mixer_left->type == MDSS_MDP_MIXER_TYPE_WRITEBACK) &&

		 (ctl->mdata->mixer_switched)) || ctl->roi_changed;

	if ((!(pipe->flags & MDP_VPU_PIPE) && src_data == NULL) ||

	if ((!(pipe->flags & MDP_VPU_PIPE) &&

			(src_data == NULL || !pipe->has_buf)) ||

			(pipe->flags & MDP_SOLID_FILL)) {

		pipe->params_changed = 0;

		mdss_mdp_pipe_solidfill_setup(pipe);
@@ -1480,10 +1481,9 @@ int mdss_mdp_pipe_queue_data(struct mdss_mdp_pipe *pipe, 
			mdss_mdp_pipe_panic_signal_ctrl(pipe, true);

	}



	if ((pipe->flags & MDP_VPU_PIPE) && (src_data == NULL ||

			!pipe->has_buf)) {

		pr_debug("%s src_data=%p has_buf=%d pipe num=%dx",

				__func__, src_data, pipe->has_buf, pipe->num);

	if (src_data == NULL || !pipe->has_buf) {

		pr_debug("src_data=%p has_buf=%d pipe num=%dx",

				src_data, pipe->has_buf, pipe->num);

		goto update_nobuf;

	}