evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm: mdss: Correct block id check for mdss_mdp_misr_table

Browse source 
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: Ping Li <pingli@codeaurora.org>
This commit is contained in:
Ping Li 2016-04-15 15:27:36 -07:00 • committed by Jeevan Shriram
parent b7d244ed56
commit 59775321c6
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/video/fbdev/msm/mdss_debug.c
View file

@ -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 *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;
} }
@ -1408,12 +1408,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;