evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm: mdss: Ensure remove vsync handler called during ctl stop

Browse source 
With current implementation, vsync handler is never removed
in case of shell stop if the call doesn't come from HAL. Due
to this in certain cases the vsync ref count is unbalanced.
MDP driver should ensure that the vsync handler is always
removed explicitly during shell stop. Fix this issue by using
separate variable for SLAVE ctx and using MASTER ctx for
removing vsync handler.

Change-Id: I281b9db0623f9760efea5b2ceb978e648083f156
Signed-off-by: Jayant Shekhar <jshekhar@codeaurora.org>
This commit is contained in:
Jayant Shekhar 2015-09-28 13:50:04 +05:30 • committed by David Keitel
parent 086f9fbaf6
commit 3b7c593e88
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/video/fbdev/msm/mdss_mdp_intf_video.c
View file

@ -497,7 +497,7 @@ static int mdss_mdp_video_intfs_stop(struct mdss_mdp_ctl *ctl,
{ {
struct mdss_data_type *mdata; struct mdss_data_type *mdata;
struct mdss_panel_info *pinfo; struct mdss_panel_info *pinfo;
struct mdss_mdp_video_ctx *ctx; struct mdss_mdp_video_ctx *ctx, *sctx = NULL;
struct mdss_mdp_vsync_handler *tmp, *handle; struct mdss_mdp_vsync_handler *tmp, *handle;
int ret = 0; int ret = 0;
@ -525,18 +525,18 @@ static int mdss_mdp_video_intfs_stop(struct mdss_mdp_ctl *ctl,
if (is_pingpong_split(ctl->mfd)) { if (is_pingpong_split(ctl->mfd)) {
pinfo = &pdata->next->panel_info; pinfo = &pdata->next->panel_info;
ctx = (struct mdss_mdp_video_ctx *) ctl->intf_ctx[SLAVE_CTX]; sctx = (struct mdss_mdp_video_ctx *) ctl->intf_ctx[SLAVE_CTX];
if (!ctx->ref_cnt) { if (!sctx->ref_cnt) {
pr_err("Intf %d not in use\n", (inum + MDSS_MDP_INTF0)); pr_err("Intf %d not in use\n", (inum + MDSS_MDP_INTF0));
return -ENODEV; return -ENODEV;
} }
pr_debug("stop ctl=%d video Intf #%d base=%p", ctl->num, pr_debug("stop ctl=%d video Intf #%d base=%p", ctl->num,
ctx->intf_num, ctx->base); sctx->intf_num, sctx->base);
ret = mdss_mdp_video_ctx_stop(ctl, pinfo, ctx); ret = mdss_mdp_video_ctx_stop(ctl, pinfo, sctx);
if (ret) { if (ret) {
pr_err("mdss_mdp_video_ctx_stop failed for intf: %d", pr_err("mdss_mdp_video_ctx_stop failed for intf: %d",
ctx->intf_num); sctx->intf_num);
return -EPERM; return -EPERM;
} }
} }