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

Commit 183eadcf 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: remove interrupt handler when pingpong is not present"

parents 488bf351 da6177f5

drivers/video/msm/mdss/mdss_mdp_intf_cmd.c

+9 −0
Original line number Diff line number Diff line
@@ -988,6 +988,8 @@ static void mdss_mdp_cmd_intf_recovery(void *data, int event) 
		pr_debug("%s: intf_num=%d\n", __func__, ctx->ctl->intf_num);

		mdss_mdp_irq_disable_nosync(MDSS_MDP_IRQ_PING_PONG_COMP,

			ctx->current_pp_num);

		mdss_mdp_set_intr_callback_nosync(MDSS_MDP_IRQ_PING_PONG_COMP,

			ctx->current_pp_num, NULL, NULL);

		if (mdss_mdp_cmd_do_notifier(ctx))

			notify_frame_timeout = true;

	}
@@ -1539,6 +1541,11 @@ static int mdss_mdp_cmd_wait4pingpong(struct mdss_mdp_ctl *ctl, void *arg) 
		}

		ctx->pp_timeout_report_cnt++;

		rc = -EPERM;



		mdss_mdp_irq_disable_nosync(MDSS_MDP_IRQ_PING_PONG_COMP,

			ctx->current_pp_num);

		mdss_mdp_set_intr_callback_nosync(MDSS_MDP_IRQ_PING_PONG_COMP,

			ctx->current_pp_num, NULL, NULL);

		if (atomic_add_unless(&ctx->koff_cnt, -1, 0)

			&& mdss_mdp_cmd_do_notifier(ctx))

			mdss_mdp_ctl_notify(ctl, MDP_NOTIFY_FRAME_TIMEOUT);
@@ -2015,6 +2022,8 @@ int mdss_mdp_cmd_ctx_stop(struct mdss_mdp_ctl *ctl, 


	mdss_mdp_set_intr_callback(MDSS_MDP_IRQ_PING_PONG_RD_PTR,

		ctx->default_pp_num, NULL, NULL);

	mdss_mdp_set_intr_callback_nosync(MDSS_MDP_IRQ_PING_PONG_COMP,

		ctx->default_pp_num, NULL, NULL);



	memset(ctx, 0, sizeof(*ctx));