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

Commit 0946696e 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: Don't schedule pp done work during on going commit"

parents b288ef22 f96152a1

drivers/video/msm/mdss/mdss_mdp.h

+1 −0
Original line number Diff line number Diff line
@@ -879,6 +879,7 @@ void mdss_mdp_ctl_notifier_register(struct mdss_mdp_ctl *ctl, 
	struct notifier_block *notifier);

void mdss_mdp_ctl_notifier_unregister(struct mdss_mdp_ctl *ctl,

	struct notifier_block *notifier);

u32 mdss_mdp_ctl_perf_get_transaction_status(struct mdss_mdp_ctl *ctl);



int mdss_mdp_scan_pipes(void);

drivers/video/msm/mdss/mdss_mdp_intf_cmd.c

+4 −1
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ static void mdss_mdp_cmd_pingpong_done(void *arg) 
	struct mdss_mdp_cmd_ctx *ctx = ctl->priv_data;

	struct mdss_mdp_vsync_handler *tmp;

	ktime_t vsync_time;

	u32 status;



	if (!ctx) {

		pr_err("%s: invalid ctx\n", __func__);
@@ -390,6 +391,8 @@ static void mdss_mdp_cmd_pingpong_done(void *arg) 
			       atomic_read(&ctx->koff_cnt));

		if (mdss_mdp_cmd_do_notifier(ctx)) {

			atomic_inc(&ctx->pp_done_cnt);

			status = mdss_mdp_ctl_perf_get_transaction_status(ctl);

			if (status == 0)

				schedule_work(&ctx->pp_done_work);

		}

		wake_up_all(&ctx->pp_waitq);