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

Commit 7d2b5d3a 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: Remove the unused has_buf pipe member"

parents 80604bd5 4a757556

drivers/video/msm/mdss/mdss_mdp.h

+0 −1
Original line number Diff line number Diff line
@@ -422,7 +422,6 @@ struct mdss_mdp_pipe { 
	u8 blend_op;

	u8 overfetch_disable;

	u32 transp;

	u8 has_buf;

	u32 bg_color;

	u32 hscl_en;

drivers/video/msm/mdss/mdss_mdp_overlay.c

+0 −5
Original line number Diff line number Diff line
@@ -906,7 +906,6 @@ int mdss_mdp_overlay_pipe_setup(struct msm_fb_data_type *mfd, 


cursor_done:

	pipe->params_changed++;

	pipe->has_buf = 0;



	req->vert_deci = pipe->vert_deci;
@@ -1725,8 +1724,6 @@ static int mdss_mdp_overlay_queue(struct msm_fb_data_type *mfd, 
		pr_err("src_data pmem error\n");

	}



	pipe->has_buf = !ret;



	mdss_mdp_pipe_unmap(pipe);



	return ret;
@@ -1944,7 +1941,6 @@ static void mdss_mdp_overlay_pan_display(struct msm_fb_data_type *mfd) 
	buf->p[0].addr += offset;

	buf->p[0].len = fbi->fix.smem_len - offset;

	buf->num_planes = 1;

	pipe->has_buf = 1;

	mdss_mdp_pipe_unmap(pipe);



	if (fbi->var.xres > mdata->max_mixer_width || is_split_lm(mfd)) {
@@ -1960,7 +1956,6 @@ static void mdss_mdp_overlay_pan_display(struct msm_fb_data_type *mfd) 
		}



		pipe->back_buf = *buf;

		pipe->has_buf = 1;

		mdss_mdp_pipe_unmap(pipe);

	}

	mutex_unlock(&mdp5_data->ov_lock);

drivers/video/msm/mdss/mdss_mdp_pipe.c

+4 −4
Original line number Diff line number Diff line
@@ -1610,7 +1610,7 @@ int mdss_mdp_pipe_queue_data(struct mdss_mdp_pipe *pipe, 
		 (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 || !pipe->has_buf)) ||

			(src_data == NULL)) ||

			(pipe->flags & MDP_SOLID_FILL)) {

		pipe->params_changed = 0;

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

	}



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

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

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

	if (src_data == NULL) {

		pr_debug("src_data=%p pipe num=%dx\n",

				src_data, pipe->num);

		goto update_nobuf;

	}

drivers/video/msm/mdss/mdss_mdp_splash_logo.c

+0 −1
Original line number Diff line number Diff line
@@ -282,7 +282,6 @@ static struct mdss_mdp_pipe *mdss_mdp_splash_get_pipe( 
	buf->p[0].addr = mfd->splash_info.iova;

	buf->p[0].len = image_size;

	buf->num_planes = 1;

	pipe->has_buf = 1;

	mdss_mdp_pipe_unmap(pipe);



	return pipe;