diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-27 18:12:00 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-27 18:11:59 -0700 |
| commit | 988a9ef2242e531819e5d1d30de4eb86f42dace1 (patch) | |
| tree | 21fe2d0e822b8472832e81e0fa4bc49bd6a88d58 /drivers/video/fbdev | |
| parent | afa71cb2a8e1fea2c169a0a4015f7fe29f600475 (diff) | |
| parent | 3a69977d0e2175db9db1b2e85dcd6f95b8ef9551 (diff) | |
Merge "msm: mdss: Disable traffic shaper in command mode"
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_pipe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_pipe.c b/drivers/video/fbdev/msm/mdss_mdp_pipe.c index 724913f376a7..e147405fd455 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_pipe.c +++ b/drivers/video/fbdev/msm/mdss_mdp_pipe.c @@ -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; |