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

Commit cda79d1f 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: Use MDP_SOLID_FILL to enable color on pipe"

parents 40de9577 569ff254

drivers/video/msm/mdss/mdss_mdp.h

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

	u32 transp;

	u32 bg_color;

	u8 has_buf;



	struct msm_fb_data_type *mfd;

	struct mdss_mdp_mixer *mixer;

drivers/video/msm/mdss/mdss_mdp_overlay.c

+3 −4
Original line number Diff line number Diff line
@@ -612,7 +612,6 @@ static int mdss_mdp_overlay_pipe_setup(struct msm_fb_data_type *mfd, 
	}



	pipe->params_changed++;

	pipe->has_buf = 0;



	req->vert_deci = pipe->vert_deci;
@@ -1261,6 +1260,9 @@ static int mdss_mdp_overlay_queue(struct msm_fb_data_type *mfd, 


	pr_debug("ov queue pnum=%d\n", pipe->num);



	if (pipe->flags & MDP_SOLID_FILL)

		pr_warn("Unexpected buffer queue to a solid fill pipe\n");



	flags = (pipe->flags & MDP_SECURE_OVERLAY_SESSION);



	src_data = &pipe->back_buf;
@@ -1274,7 +1276,6 @@ 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;

	mdss_mdp_pipe_unmap(pipe);



	return ret;
@@ -1517,7 +1518,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 > MAX_MIXER_WIDTH || mfd->split_display) {
@@ -1532,7 +1532,6 @@ static void mdss_mdp_overlay_pan_display(struct msm_fb_data_type *mfd) 
			goto pan_display_error;

		}

		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

+1 −1
Original line number Diff line number Diff line
@@ -1008,7 +1008,7 @@ int mdss_mdp_pipe_queue_data(struct mdss_mdp_pipe *pipe, 
			 (pipe->mixer->type == MDSS_MDP_MIXER_TYPE_WRITEBACK)

			 && (ctl->mdata->mixer_switched)) ||

			 ctl->roi_changed;

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

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

		pipe->params_changed = 0;

		mdss_mdp_pipe_solidfill_setup(pipe);

		goto update_nobuf;

include/uapi/linux/msm_mdp.h

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ enum { 
#define MDP_BLUR 0x10

#define MDP_BLEND_FG_PREMULT 0x20000

#define MDP_IS_FG 0x40000

#define MDP_SOLID_FILL 0x0000100

#define MDP_SOLID_FILL 0x00000020

#define MDP_DEINTERLACE 0x80000000

#define MDP_SHARPENING  0x40000000

#define MDP_NO_DMA_BARRIER_START	0x20000000