diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-12 22:39:06 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-12 22:39:06 -0800 |
| commit | cfa822c282cf74079ceb07ec4813bbc13b1c27c5 (patch) | |
| tree | 63e29bf579327381e5e5ca3bf5dddf60657e28db /drivers/video/fbdev | |
| parent | 075893a01135f851d37ecadbfa7a605d228e09e4 (diff) | |
| parent | 613e6e44f07a3dd82929d631483cef4ff324bbc9 (diff) | |
Merge "msm: mdss: Fix ctl flush bits reset by dspp programming"
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_ctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_ctl.c b/drivers/video/fbdev/msm/mdss_mdp_ctl.c index 5246e5d1166c..f397aca8ad3a 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_ctl.c +++ b/drivers/video/fbdev/msm/mdss_mdp_ctl.c @@ -5834,10 +5834,10 @@ int mdss_mdp_display_commit(struct mdss_mdp_ctl *ctl, void *arg, sctl->flush_bits = 0; sctl_flush_bits = 0; } else { - sctl_flush_bits = sctl->flush_bits; + sctl_flush_bits |= sctl->flush_bits; } } - ctl_flush_bits = ctl->flush_bits; + ctl_flush_bits |= ctl->flush_bits; mutex_unlock(&ctl->flush_lock); } /* |