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

Commit b0580e39 authored by Benjamin Chan's avatar Benjamin Chan
Browse files

msm: sde: fix compiler error on hw timestamp update 



Merge code conflict overwrites hw timestamp changes. This patch fix the
compiler error caused by that.

Change-Id: I3b0e42f7498ac4bf91898e04373610a6cad16c8e
Signed-off-by: default avatarBenjamin Chan <bkchan@codeaurora.org>
parent 60a1ab34

drivers/media/platform/msm/sde/rotator/sde_rotator_r3.c

+1 −1
Original line number Diff line number Diff line
@@ -2950,7 +2950,7 @@ static int sde_hw_rotator_abort_kickoff(struct sde_rot_hw_resource *hw, 
	}



	spin_lock_irqsave(&rot->rotisr_lock, flags);

	sde_hw_rotator_update_swts(rot, ctx, ctx->timestamp);

	rot->ops.update_ts(rot, ctx->q_id, ctx->timestamp);

	ctx->abort = true;

	wake_up_all(&ctx->regdma_waitq);

	spin_unlock_irqrestore(&rot->rotisr_lock, flags);