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

Commit 0b9bbac1 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: fix solid fill programming on pipe"

parents e0205b17 33a94741

drivers/video/msm/mdss/mdss_mdp_overlay.c

+0 −1
Original line number Diff line number Diff line
@@ -1899,7 +1899,6 @@ int mdss_mdp_overlay_kickoff(struct msm_fb_data_type *mfd, 
	 * to ensure no fetches are happening after dettach or reattach.

	 */

	list_for_each_entry_safe(pipe, tmp, &mdp5_data->pipes_cleanup, list) {

		mdss_mdp_pipe_queue_data(pipe, NULL);

		mdss_mdp_mixer_pipe_unstage(pipe, pipe->mixer_left);

		mdss_mdp_mixer_pipe_unstage(pipe, pipe->mixer_right);

		pipe->mixer_stage = MDSS_MDP_STAGE_UNUSED;

drivers/video/msm/mdss/mdss_mdp_pipe.c

+4 −2
Original line number Diff line number Diff line
@@ -2023,7 +2023,7 @@ static int mdss_mdp_src_addr_setup(struct mdss_mdp_pipe *pipe, 
static int mdss_mdp_pipe_solidfill_setup(struct mdss_mdp_pipe *pipe)

{

	int ret;

	u32 secure, format, unpack;

	u32 secure, format, unpack, opmode = 0;



	pr_debug("solid fill setup on pnum=%d\n", pipe->num);
@@ -2044,7 +2044,9 @@ static int mdss_mdp_pipe_solidfill_setup(struct mdss_mdp_pipe *pipe) 
		pipe->bg_color);

	mdss_mdp_pipe_write(pipe, MDSS_MDP_REG_SSPP_SRC_UNPACK_PATTERN, unpack);

	mdss_mdp_pipe_write(pipe, MDSS_MDP_REG_SSPP_SRC_ADDR_SW_STATUS, secure);

	mdss_mdp_pipe_write(pipe, MDSS_MDP_REG_SSPP_SRC_OP_MODE, 0);

	if (pipe->scale.enable_pxl_ext)

		opmode |= (1 << 31);

	mdss_mdp_pipe_write(pipe, MDSS_MDP_REG_SSPP_SRC_OP_MODE, opmode);



	if (pipe->type != MDSS_MDP_PIPE_TYPE_DMA) {

		mdss_mdp_pipe_write(pipe, MDSS_MDP_REG_SCALE_CONFIG, 0);