remove pendinginst stuff

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

1 files changed, 0 insertions, 71 deletions

diff --git a/src/vpu_lib.c b/src/vpu_lib.c
index 3e09373..81feda1 100644
--- a/src/vpu_lib.c
+++ b/src/vpu_lib.c
@@ -73,10 +73,6 @@ static PhysicalAddress disFlagRegAddr[] = {
 	BIT_FRM_DIS_FLG_3
 };
 
-/* If a frame is started, pendingInst is set to the proper instance. */
-static CodecInst *pendingInstDec;
-static CodecInst *pendingInstEnc;
-
 static PhysicalAddress workBuffer;
 static PhysicalAddress codeBuffer;
 static PhysicalAddress paraBuffer;
@@ -233,10 +229,6 @@ vpu_GetVersionInfo(vpu_versioninfo * verinfo)
 		return RETCODE_NOT_INITIALIZED;
 	}
 
-	if (pendingInstDec || pendingInstEnc) {
-		return RETCODE_FRAME_NOT_COMPLETE;
-	}
-
 	VpuWriteReg(RET_VER_NUM, 0);
 
 	VpuWriteReg(BIT_BUSY_FLAG, 0x1);
@@ -391,10 +383,6 @@ vpu_EncClose(EncHandle handle)
 	if (ret != RETCODE_SUCCESS)
 		return ret;
 
-	if (pendingInstEnc) {
-		return RETCODE_FRAME_NOT_COMPLETE;
-	}
-
 	pCodecInst = handle;
 	pEncInfo = &pCodecInst->CodecInfo.encInfo;
 	if (pEncInfo->initialInfoObtained) {
@@ -438,10 +426,6 @@ vpu_EncGetInitialInfo(EncHandle handle, EncInitialInfo * info)
 	if (ret != RETCODE_SUCCESS)
 		return ret;
 
-	if (pendingInstEnc) {
-		return RETCODE_FRAME_NOT_COMPLETE;
-	}
-
 	if (info == 0) {
 		return RETCODE_INVALID_PARAM;
 	}
@@ -580,10 +564,6 @@ vpu_EncRegisterFrameBuffer(EncHandle handle,
 	if (ret != RETCODE_SUCCESS)
 		return ret;
 
-	if (pendingInstEnc) {
-		return RETCODE_FRAME_NOT_COMPLETE;
-	}
-
 	pCodecInst = handle;
 	pEncInfo = &pCodecInst->CodecInfo.encInfo;
 
@@ -759,10 +739,6 @@ vpu_EncStartOneFrame(EncHandle handle, EncParam * param)
 	if (ret != RETCODE_SUCCESS)
 		return ret;
 
-	if (pendingInstEnc) {
-		return RETCODE_FRAME_NOT_COMPLETE;
-	}
-
 	pCodecInst = handle;
 	pEncInfo = &pCodecInst->CodecInfo.encInfo;
 
@@ -847,8 +823,6 @@ vpu_EncStartOneFrame(EncHandle handle, EncParam * param)
 	VpuWriteReg(BIT_BUSY_FLAG, 0x1);
 	BitIssueCommand(pCodecInst->instIndex, pCodecInst->codecMode, PIC_RUN);
 
-	pendingInstEnc = pCodecInst;
-
 	return RETCODE_SUCCESS;
 }
 
@@ -884,14 +858,6 @@ vpu_EncGetOutputInfo(EncHandle handle, EncOutputInfo * info)
 	pCodecInst = handle;
 	pEncInfo = &pCodecInst->CodecInfo.encInfo;
 
-	if (pendingInstEnc == 0) {
-		return RETCODE_WRONG_CALL_SEQUENCE;
-	}
-
-	if (pCodecInst != pendingInstEnc) {
-		return RETCODE_INVALID_HANDLE;
-	}
-
 	info->picType = VpuReadReg(RET_ENC_PIC_TYPE);
 
 	if (pEncInfo->ringBufferEnable == 0) {
@@ -942,8 +908,6 @@ vpu_EncGetOutputInfo(EncHandle handle, EncOutputInfo * info)
 		info->mbQpInfo = virt_paraBuf2;
 	}
 
-	pendingInstEnc = 0;
-
 	return RETCODE_SUCCESS;
 }
 
@@ -971,10 +935,6 @@ vpu_EncGiveCommand(EncHandle handle, CodecCommand cmd, void *param)
 		return ret;
 	}
 
-	if (pendingInstEnc) {
-		return RETCODE_FRAME_NOT_COMPLETE;
-	}
-
 	pCodecInst = handle;
 	pEncInfo = &pCodecInst->CodecInfo.encInfo;
 
@@ -1421,10 +1381,6 @@ vpu_DecClose(DecHandle handle)
 	if (ret != RETCODE_SUCCESS)
 		return ret;
 
-	if (pendingInstDec) {
-		return RETCODE_FRAME_NOT_COMPLETE;
-	}
-
 	pCodecInst = handle;
 	pDecInfo = &pCodecInst->CodecInfo.decInfo;
 
@@ -1474,10 +1430,6 @@ vpu_DecGetInitialInfo(DecHandle handle, DecInitialInfo * info)
 		return RETCODE_INVALID_PARAM;
 	}
 
-	if (pendingInstDec) {
-		return RETCODE_FRAME_NOT_COMPLETE;
-	}
-
 	pCodecInst = handle;
 	pDecInfo = &pCodecInst->CodecInfo.decInfo;
 
@@ -1675,10 +1627,6 @@ vpu_DecStartOneFrame(DecHandle handle, DecParam * param, FrameBuffer *frame)
 	if (ret != RETCODE_SUCCESS)
 		return ret;
 
-	if (pendingInstDec) {
-		return RETCODE_FRAME_NOT_COMPLETE;
-	}
-
 	pCodecInst = handle;
 	pDecInfo = &pCodecInst->CodecInfo.decInfo;
 
@@ -1730,7 +1678,6 @@ vpu_DecStartOneFrame(DecHandle handle, DecParam * param, FrameBuffer *frame)
 	VpuWriteReg(BIT_BUSY_FLAG, 0x1);
 	BitIssueCommand(pCodecInst->instIndex, pCodecInst->codecMode, PIC_RUN);
 
-	pendingInstDec = pCodecInst;
 	return RETCODE_SUCCESS;
 }
 
@@ -1765,19 +1712,10 @@ vpu_DecGetOutputInfo(DecHandle handle, DecOutputInfo * info)
 	pCodecInst = handle;
 	pDecInfo = &pCodecInst->CodecInfo.decInfo;
 
-	if (pendingInstDec == 0) {
-		return RETCODE_WRONG_CALL_SEQUENCE;
-	}
-
-	if (pCodecInst != pendingInstDec) {
-		return RETCODE_INVALID_HANDLE;
-	}
-
 	info->notSufficientPsBuffer = (VpuReadReg(RET_DEC_PIC_SUCCESS) >> 3) & 0x1;
 	info->notSufficientSliceBuffer = (VpuReadReg(RET_DEC_PIC_SUCCESS) >> 2) & 0x1;
 
 	if ((VpuReadReg(RET_DEC_PIC_SUCCESS) & 0x01) == 0) {
-		pendingInstDec = 0;
 		return RETCODE_FAILURE;
 	}
 
@@ -1829,7 +1767,6 @@ vpu_DecGetOutputInfo(DecHandle handle, DecOutputInfo * info)
 		info->qpInfo = virt_paraBuf2;
 	}
 
-	pendingInstDec = 0;
 	return RETCODE_SUCCESS;
 }
 
@@ -1871,10 +1808,6 @@ vpu_DecBitBufferFlush(DecHandle handle)
 	if (ret != RETCODE_SUCCESS)
 		return ret;
 
-	if (pendingInstDec) {
-		return RETCODE_FRAME_NOT_COMPLETE;
-	}
-
 	pCodecInst = handle;
 	pDecInfo = &pCodecInst->CodecInfo.decInfo;
 
@@ -1967,10 +1900,6 @@ vpu_DecGiveCommand(DecHandle handle, CodecCommand cmd, void *param)
 	if (ret != RETCODE_SUCCESS)
 		return ret;
 
-	if (pendingInstDec) {
-		return RETCODE_FRAME_NOT_COMPLETE;
-	}
-
 	if (cpu_is_mx27() && (cmd == DEC_SET_DEBLOCK_OUTPUT)) {
 		return RETCODE_NOT_SUPPORTED;
 	}