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

Commit b8f1ca87 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdp3: underflow color adjust support on 8x10"

parents 82f65324 56b923ae

drivers/video/msm/mdss/mdp3_ctrl.c

+1 −0
Original line number Diff line number Diff line
@@ -486,6 +486,7 @@ static int mdp3_ctrl_intf_init(struct msm_fb_data_type *mfd, 
		video->hsync_polarity = 1;

		video->vsync_polarity = 1;

		video->de_polarity = 1;

		video->underflow_color = p->lcdc.underflow_clr;

	} else if (cfg.type == MDP3_DMA_OUTPUT_SEL_DSI_CMD) {

		cfg.dsi_cmd.primary_dsi_cmd_id = 0;

		cfg.dsi_cmd.secondary_dsi_cmd_id = 1;

drivers/video/msm/mdss/mdp3_dma.c

+3 −1
Original line number Diff line number Diff line
@@ -1060,7 +1060,9 @@ int dsi_video_config(struct mdp3_intf *intf, struct mdp3_intf_cfg *cfg) 
		temp |= BIT(2);

	MDP3_REG_WRITE(MDP3_REG_DSI_VIDEO_CTL_POLARITY, temp);



	MDP3_REG_WRITE(MDP3_REG_DSI_VIDEO_UNDERFLOW_CTL, 0x800000ff);

	v->underflow_color |= 0x80000000;

	MDP3_REG_WRITE(MDP3_REG_DSI_VIDEO_UNDERFLOW_CTL, v->underflow_color);



	return 0;

}

drivers/video/msm/mdss/mdp3_dma.h

+1 −0
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ struct mdp3_video_intf_cfg { 
	int hsync_polarity;

	int vsync_polarity;

	int de_polarity;

	int underflow_color;

};



struct mdp3_dsi_cmd_intf_cfg {