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

Commit e24ecad7 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: Correct block id check for mdss_mdp_misr_table"

parents e22c8bb1 e0bb1877

drivers/video/msm/mdss/mdss_debug.c

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

	char *ctrl_reg = NULL, *value_reg = NULL;

	char *intf_base = 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);

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

		return NULL;

		return NULL;

	}

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

	bool is_valid_wb_mixer = true;

	bool use_mdp_up_misr = false;

	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",

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

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

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





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

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

		ctl->is_video_mode);

		ctl->is_video_mode);



	if (!map) {

	if (!map) {

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

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

		return -EINVAL;

		return -EINVAL;