Merge "msm: sde: Move SDE rotator timeout evtlog outside of spinlock" into msm-4.8 (e2cace44) · Commits · e / devices / android_kernel_fairphone_FP3

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -356,8 +356,6 @@ static void sde_hw_rotator_dump_status(struct sde_hw_rotator *rot)
		REGDMA_CSR_REGDMA_INVALID_CMD_RAM_OFFSET),
		SDE_ROTREG_READ(rot->mdss_base,
		REGDMA_CSR_REGDMA_FSM_STATE));

		SDEROT_EVTLOG_TOUT_HANDLER("rot", "vbif_dbg_bus", "panic");
		}

		/**
		@@ -1096,6 +1094,9 @@ static u32 sde_hw_rotator_wait_done_regdma(

		sts = (status & ROT_ERROR_BIT) ? -ENODEV : 0;

		if (status & ROT_ERROR_BIT)
		SDEROT_EVTLOG_TOUT_HANDLER("rot", "vbif_dbg_bus", "panic");

		return sts;
		}