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

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

Merge "mdss: mdp: modify MISR offset for 8952"

parents 50ae5d96 0de038a9

drivers/video/msm/mdss/mdss_debug.c

+16 −4
Original line number Diff line number Diff line
@@ -1226,16 +1226,28 @@ static inline struct mdss_mdp_misr_map *mdss_misr_get_map(u32 block_id, 
			if (block_id <= DISPLAY_MISR_HDMI) {

				intf_base = (char *)mdss_mdp_get_intf_base_addr(

						mdata, block_id);

				ctrl_reg = intf_base + MDSS_MDP_INTF_MISR_CTRL;



				if ((block_id == DISPLAY_MISR_DSI0 ||

				     block_id == DISPLAY_MISR_DSI1) &&

				     (ctl && !ctl->is_video_mode)) {

					ctrl_reg = intf_base +

						MDSS_MDP_INTF_CMD_MISR_CTRL;

					value_reg = intf_base +

					    MDSS_MDP_INTF_CMD_MISR_SIGNATURE;

				} else {

					ctrl_reg = intf_base +

						MDSS_MDP_INTF_MISR_CTRL;

					value_reg = intf_base +

						MDSS_MDP_INTF_MISR_SIGNATURE;

				}

			}

			/*

			 * For msm8916/8939, additional offset of 0x10

			 * is required

			 */

			if ((mdata->mdp_rev == MDSS_MDP_HW_REV_106) ||

				(mdata->mdp_rev == MDSS_MDP_HW_REV_108)) {

				(mdata->mdp_rev == MDSS_MDP_HW_REV_108) ||

				(mdata->mdp_rev == MDSS_MDP_HW_REV_112)) {

				ctrl_reg += 0x10;

				value_reg += 0x10;

			}

drivers/video/msm/mdss/mdss_mdp_hwio.h

+4 −0
Original line number Diff line number Diff line
@@ -658,6 +658,8 @@ enum mdss_mdp_pingpong_index { 


#define MDSS_MDP_INTF_MISR_CTRL		0x180

#define MDSS_MDP_INTF_MISR_SIGNATURE		(MDSS_MDP_INTF_MISR_CTRL + 0x4)

#define MDSS_MDP_INTF_CMD_MISR_CTRL		(MDSS_MDP_INTF_MISR_CTRL + 0x8)

#define MDSS_MDP_INTF_CMD_MISR_SIGNATURE	(MDSS_MDP_INTF_MISR_CTRL + 0xC)



#define MDSS_MDP_REG_CDM_CSC_10_OPMODE                  0x000

#define MDSS_MDP_REG_CDM_CSC_10_BASE                    0x004
@@ -680,6 +682,8 @@ enum mdss_mdp_pingpong_index { 


/* Following offsets are with respect to MDP base */

#define MDSS_MDP_MDP_OUT_CTL_0                          0x410

#define MDSS_MDP_INTF_CMD_MISR_CTRL		(MDSS_MDP_INTF_MISR_CTRL + 0x8)

#define MDSS_MDP_INTF_CMD_MISR_SIGNATURE	(MDSS_MDP_INTF_MISR_CTRL + 0xC)

/* following offsets are with respect to MDP VBIF base */

#define MMSS_VBIF_CLKON			0x4

#define MMSS_VBIF_RD_LIM_CONF			0x0B0