Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 730fd71e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: fix concurrency between add vsync handler and stop"

parents 03a13989 dc6fbf3f

drivers/video/msm/mdss/mdss_mdp_intf_cmd.c

+8 −2
Original line number Diff line number Diff line
@@ -1171,11 +1171,14 @@ static int mdss_mdp_cmd_add_vsync_handler(struct mdss_mdp_ctl *ctl, 
	struct mdss_mdp_cmd_ctx *ctx, *sctx = NULL;

	unsigned long flags;

	bool enable_rdptr = false;

	int ret = 0;



	mutex_lock(&ctl->offlock);

	ctx = (struct mdss_mdp_cmd_ctx *) ctl->intf_ctx[MASTER_CTX];

	if (!ctx) {

		pr_err("%s: invalid ctx\n", __func__);

		return -ENODEV;

		ret = -ENODEV;

		goto done;

	}



	pr_debug("%pS->%s ctl:%d\n",
@@ -1206,7 +1209,10 @@ static int mdss_mdp_cmd_add_vsync_handler(struct mdss_mdp_ctl *ctl, 
			mutex_unlock(&cmd_clk_mtx);

	}



	return 0;

done:

	mutex_unlock(&ctl->offlock);



	return ret;

}



static int mdss_mdp_cmd_remove_vsync_handler(struct mdss_mdp_ctl *ctl,