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

Commit abd4ee60 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: spin lock is necessary when reset rdptr_enabled"

parents b1cccd53 37a26a8a

drivers/video/msm/mdss/mdss_mdp_intf_cmd.c

+7 −2
Original line number Diff line number Diff line
@@ -859,6 +859,7 @@ int mdss_mdp_cmd_intfs_stop(struct mdss_mdp_ctl *ctl, int session, 
	struct mdss_mdp_cmd_ctx *sctx = NULL;

	struct mdss_mdp_cmd_ctx *ctx;

	unsigned long flags;

	unsigned long sflags;

	int need_wait = 0;

	int ret = 0;

	int hz;
@@ -894,8 +895,12 @@ int mdss_mdp_cmd_intfs_stop(struct mdss_mdp_ctl *ctl, int session, 
		 * next vsync if there has no kickoff pending

		 */

		ctx->rdptr_enabled = 1;

		if (sctx && sctx->rdptr_enabled)

		if (sctx) {

			spin_lock_irqsave(&sctx->clk_lock, sflags);

			if (sctx->rdptr_enabled)

				sctx->rdptr_enabled = 1;

			spin_unlock_irqrestore(&sctx->clk_lock, sflags);

		}

	}

	spin_unlock_irqrestore(&ctx->clk_lock, flags);