Merge "msm: mdss: Disable traffic shaper in command mode"

This commit is contained in:
Linux Build Service Account 2017-05-27 18:12:00 -07:00 committed by Gerrit - the friendly Code Review server
commit 988a9ef224

View file

@ -2414,9 +2414,9 @@ bool mdss_mdp_is_amortizable_pipe(struct mdss_mdp_pipe *pipe,
(mixer->type == MDSS_MDP_MIXER_TYPE_INTF)))
return false;
/* do not apply for sdm660 & sdm630 in command mode */
if ((IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev, MDSS_MDP_HW_REV_320) ||
IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev, MDSS_MDP_HW_REV_330))
/* do not apply for msm8998, sdm660 & sdm630 in command mode */
if (MDSS_GET_MAJOR(mdata->mdp_rev) ==
MDSS_GET_MAJOR(MDSS_MDP_HW_REV_300)
&& !mixer->ctl->is_video_mode)
return false;