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

Commit e0bb1877 authored by Ping Li's avatar Ping Li
Browse files

msm: mdss: Correct block id check for mdss_mdp_misr_table 



DISPLAY_MISR_LCDC block doesn't have corresponding mdss_mdp_misr_table,
this change corrects the block id check for mdss_mdp_misr_table.

CRs-Fixed: 1001224
Change-Id: I74b03c31542d4b239eb2ffdc4dc6345dff5eab86
Signed-off-by: default avatarPing Li <pingli@codeaurora.org>
parent 22c4c57b

drivers/video/msm/mdss/mdss_debug.c

+6 −2
Original line number Diff line number Diff line
@@ -1266,7 +1266,7 @@ static inline struct mdss_mdp_misr_map *mdss_misr_get_map(u32 block_id, 
	char *ctrl_reg = NULL, *value_reg = NULL;

	char *intf_base = NULL;



	if (block_id > DISPLAY_MISR_MDP) {

	if (block_id > DISPLAY_MISR_HDMI && block_id != DISPLAY_MISR_MDP) {

		pr_err("MISR Block id (%d) out of range\n", block_id);

		return NULL;

	}
@@ -1408,12 +1408,16 @@ int mdss_misr_set(struct mdss_data_type *mdata, 
	bool is_valid_wb_mixer = true;

	bool use_mdp_up_misr = false;



	if (!mdata || !req || !ctl) {

		pr_err("Invalid input params: mdata = %p req = %p ctl = %p",

			mdata, req, ctl);

		return -EINVAL;

	}

	pr_debug("req[block:%d frame:%d op_mode:%d]\n",

		req->block_id, req->frame_count, req->crc_op_mode);



	map = mdss_misr_get_map(req->block_id, ctl, mdata,

		ctl->is_video_mode);



	if (!map) {

		pr_err("Invalid MISR Block=%d\n", req->block_id);

		return -EINVAL;