diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2020-04-04 05:31:21 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2020-04-04 05:31:21 -0700 |
| commit | 8cd80fc3da7f99d6c349989819b1aa2143a3c195 (patch) | |
| tree | bdfb5c3b12f62abe40924feb8cce9def985c4772 /drivers/video/fbdev/msm | |
| parent | f3e07363152792fb04d86b4afb50b9d47fba4513 (diff) | |
| parent | b69408be07c5ad8b5636075fc58360cb4a5374ee (diff) | |
Merge "fbdev/msm: Modify cdm block destroy sequence"
Diffstat (limited to 'drivers/video/fbdev/msm')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_intf_video.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_intf_video.c b/drivers/video/fbdev/msm/mdss_mdp_intf_video.c index 29fe0f861593..3761fa4af0eb 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_intf_video.c +++ b/drivers/video/fbdev/msm/mdss_mdp_intf_video.c @@ -1097,13 +1097,6 @@ static int mdss_mdp_video_stop(struct mdss_mdp_ctl *ctl, int panel_power_state) { int intfs_num, ret = 0; - if (ctl->cdm) { - if (!mdss_mdp_cdm_destroy(ctl->cdm)) - mdss_mdp_ctl_write(ctl, - MDSS_MDP_REG_CTL_FLUSH, BIT(26)); - ctl->cdm = NULL; - } - intfs_num = ctl->intf_num - MDSS_MDP_INTF0; ret = mdss_mdp_video_intfs_stop(ctl, ctl->panel_data, intfs_num); if (IS_ERR_VALUE(ret)) { @@ -1111,6 +1104,12 @@ static int mdss_mdp_video_stop(struct mdss_mdp_ctl *ctl, int panel_power_state) return ret; } + if (ctl->cdm) { + if (!mdss_mdp_cdm_destroy(ctl->cdm)) + mdss_mdp_ctl_write(ctl, + MDSS_MDP_REG_CTL_FLUSH, BIT(26)); + ctl->cdm = NULL; + } MDSS_XLOG(ctl->num, ctl->vsync_cnt); mdss_mdp_ctl_reset(ctl, false); |