diff options
author | Dhaval Patel <pdhaval@codeaurora.org> | 2015-09-18 18:04:12 -0700 |
---|---|---|
committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:46:14 -0700 |
commit | 81f33f9772e3b56abdfb6b960f29ea52408cea4a (patch) | |
tree | 0e493be43fb264b383bd22710136585b84c2b415 | |
parent | 4341a02cccc0ddf571904da4b5f55366663ae8d1 (diff) |
msm: mdss: reset cdm pointer when ctl is destroyed
Control structure is reused between interface and
rotator. It may possible that rotator will reuse the
control data structure previously used by writeback
interface which has cdm block allocated. It is safe
to reset the cdm pointer during control free to
avoid cdm setup during writeback format setup in
rotator scenario.
Change-Id: I7bef9893d6034ac3985c8808a1defeb15f0cf3fd
Signed-off-by: Dhaval Patel <pdhaval@codeaurora.org>
-rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_ctl.c | 1 | ||||
-rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_intf_writeback.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_ctl.c b/drivers/video/fbdev/msm/mdss_mdp_ctl.c index a736aeeb7384..fd6294e2d575 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_ctl.c +++ b/drivers/video/fbdev/msm/mdss_mdp_ctl.c @@ -2096,6 +2096,7 @@ int mdss_mdp_ctl_free(struct mdss_mdp_ctl *ctl) ctl->mixer_left = NULL; ctl->mixer_right = NULL; ctl->wb = NULL; + ctl->cdm = NULL; memset(&ctl->ops, 0, sizeof(ctl->ops)); mutex_unlock(&mdss_mdp_ctl_lock); diff --git a/drivers/video/fbdev/msm/mdss_mdp_intf_writeback.c b/drivers/video/fbdev/msm/mdss_mdp_intf_writeback.c index 3afd2e57dfbf..a2aacd9550db 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_intf_writeback.c +++ b/drivers/video/fbdev/msm/mdss_mdp_intf_writeback.c @@ -853,6 +853,7 @@ int mdss_mdp_writeback_start(struct mdss_mdp_ctl *ctl) return -EBUSY; } } else { + ctl->cdm = NULL; pr_debug("%s: cdm not supported\n", __func__); } ctl->priv_data = ctx; |