diff options
| author | Adrian Salido-Moreno <adrianm@codeaurora.org> | 2012-10-01 18:50:16 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:12:52 -0700 |
| commit | 160005fdb87165c70bb50dd37245d546b5f04eee (patch) | |
| tree | f5a80cca496c405e5544bb842340d70bb6fc1bc5 | |
| parent | c849ed7eacf8188e28ab8d7fb34d79282e81cda3 (diff) | |
msm: mdss: fix rotator session not being closed correctly
User space expects non-negative number as session id, update rotator
mask to avoid making rotator session as negative.
When rotator is closed, need to recalculate bus/mdp clock numbers.
Change-Id: I6c0e3bfa5394fb64b78fb47be1f24462e320916d
Signed-off-by: Adrian Salido-Moreno <adrianm@codeaurora.org>
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_ctl.c | 2 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_rotator.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_ctl.c b/drivers/video/fbdev/msm/mdss_mdp_ctl.c index a86dff7c1326..f51a8cb450fb 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_ctl.c +++ b/drivers/video/fbdev/msm/mdss_mdp_ctl.c @@ -360,6 +360,8 @@ int mdss_mdp_wb_mixer_destroy(struct mdss_mdp_mixer *mixer) mdss_mdp_mixer_free(mixer); mdss_mdp_ctl_free(ctl); + mdss_mdp_ctl_perf_commit(MDSS_MDP_PERF_UPDATE_ALL); + return 0; } diff --git a/drivers/video/fbdev/msm/mdss_mdp_rotator.h b/drivers/video/fbdev/msm/mdss_mdp_rotator.h index 7d39c72f8585..c09db6fb7767 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_rotator.h +++ b/drivers/video/fbdev/msm/mdss_mdp_rotator.h @@ -17,7 +17,7 @@ #include "mdss_mdp.h" -#define MDSS_MDP_ROT_SESSION_MASK 0x80000000 +#define MDSS_MDP_ROT_SESSION_MASK 0x40000000 struct mdss_mdp_rotator_session { u32 session_id; |