diff options
| author | Carl Vanderlip <carlv@codeaurora.org> | 2013-05-15 11:44:52 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:17:39 -0700 |
| commit | 712d2863854e1ae64ef6ea4e711403a6634d14dc (patch) | |
| tree | 423d11601c98683e70c09a22cef40b80bc7e2dc9 | |
| parent | 0d2321769751b63d79c318a98e76e63edca18a31 (diff) | |
msm: mdss: Reduce assertive display log messages
Silence valid cases of assertive display being checked to run on secondary,
dual pipe or command mode displays.
Change-Id: I7a770ccc4cd69f1296c2d91e3abfb685fd093b5a
Signed-off-by: Carl Vanderlip <carlv@codeaurora.org>
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_pp.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_pp.c b/drivers/video/fbdev/msm/mdss_mdp_pp.c index 13c01afa446b..b6f91f49547e 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_pp.c +++ b/drivers/video/fbdev/msm/mdss_mdp_pp.c @@ -1022,6 +1022,8 @@ static int pp_dspp_setup(u32 disp_num, struct mdss_mdp_mixer *mixer) int i, ret = 0; struct mdss_data_type *mdata; struct mdss_mdp_ctl *ctl; + u32 mixer_cnt; + u32 mixer_id[MDSS_MDP_INTF_MAX_LAYERMIXER]; if (!mixer || !mixer->ctl || !mixer->ctl->mdata) return -EINVAL; @@ -1046,7 +1048,9 @@ static int pp_dspp_setup(u32 disp_num, struct mdss_mdp_mixer *mixer) else flags = 0; - if (dspp_num < mdata->nad_cfgs) { + mixer_cnt = mdss_mdp_get_ctl_mixers(disp_num, mixer_id); + if (dspp_num < mdata->nad_cfgs && (mixer_cnt != 2) && + ctl->mfd->panel_info->type != MIPI_CMD_PANEL) { ret = mdss_mdp_ad_setup(ctl->mfd); if (ret < 0) pr_warn("ad_setup(dspp%d) returns %d", dspp_num, ret); @@ -2755,6 +2759,13 @@ static int pp_update_ad_input(struct msm_fb_data_type *mfd) { struct mdss_ad_info *ad; struct mdss_ad_input input; + struct mdss_mdp_ctl *ctl; + + if (!mfd) + return -EINVAL; + ctl = mfd_to_ctl(mfd); + if (!ctl) + return -EINVAL; ad = mdss_mdp_get_ad(mfd); if (!ad || ad->cfg.mode == MDSS_AD_MODE_AUTO_BL) |