Commit dda76be7 authored by Bob Beckett's avatar Bob Beckett
Browse files

[FIXUP] media/wave5: fix pendingInst handling


Signed-off-by: Bob Beckett's avatarRobert Beckett <bob.beckett@collabora.com>
parent a4d7e2ce
......@@ -474,7 +474,7 @@ enum RetCode VPU_DecCompleteSeqInit(struct vpu_instance *inst, struct DecInitial
pDecInfo->initialInfo = *info;
vpu_dev->pendingInst = inst;
vpu_dev->pendingInst = NULL;
LeaveLock(vpu_dev);
......@@ -908,7 +908,7 @@ enum RetCode VPU_DecStartOneFrame(struct vpu_instance *inst, struct DecParam *pa
ret = Wave5VpuDecode(inst, param);
if (pAttr->supportCommandQueue == TRUE) {
vpu_dev->pendingInst = inst;
vpu_dev->pendingInst = NULL;
LeaveLock(vpu_dev);
}
else {
......@@ -951,7 +951,7 @@ enum RetCode VPU_DecGetOutputInfo(struct vpu_instance *inst, struct DecOutputInf
}
else {
if (inst != vpu_dev->pendingInst) {
vpu_dev->pendingInst = inst;
vpu_dev->pendingInst = NULL;
LeaveLock(vpu_dev);
return RETCODE_WRONG_CALL_SEQUENCE;
}
......@@ -963,7 +963,7 @@ enum RetCode VPU_DecGetOutputInfo(struct vpu_instance *inst, struct DecOutputInf
if (ret != RETCODE_SUCCESS) {
info->rdPtr = pDecInfo->streamRdPtr;
info->wrPtr = pDecInfo->streamWrPtr;
vpu_dev->pendingInst = inst;
vpu_dev->pendingInst = NULL;
LeaveLock(vpu_dev);
return ret;
}
......@@ -1189,7 +1189,7 @@ enum RetCode VPU_DecGetOutputInfo(struct vpu_instance *inst, struct DecOutputInf
}
}
vpu_dev->pendingInst = inst;
vpu_dev->pendingInst = NULL;
LeaveLock(vpu_dev);
......@@ -1471,7 +1471,7 @@ enum RetCode VPU_EncRegisterFrameBuffer(struct vpu_instance *inst, int num, int
pCodecInst, fb, (enum TiledMapType)mapType, num, stride, height, (enum FrameBufferFormat)openParam->srcFormat,
openParam->cbcrInterleave, FALSE, openParam->frameEndian);
if (ret != RETCODE_SUCCESS) {
vpu_dev->pendingInst = inst;
vpu_dev->pendingInst = NULL;
LeaveLock(vpu_dev);
return ret;
}
......@@ -1479,7 +1479,7 @@ enum RetCode VPU_EncRegisterFrameBuffer(struct vpu_instance *inst, int num, int
ret = VpuRegisterFramebuffer(inst);
vpu_dev->pendingInst = inst;
vpu_dev->pendingInst = NULL;
LeaveLock(vpu_dev);
......@@ -1530,7 +1530,7 @@ enum RetCode VPU_EncStartOneFrame(
ret = Wave5VpuEncode(inst, param);
if (pAttr->supportCommandQueue == TRUE) {
vpu_dev->pendingInst = inst;
vpu_dev->pendingInst = NULL;
LeaveLock(vpu_dev);
}
else {
......@@ -1569,7 +1569,7 @@ enum RetCode VPU_EncGetOutputInfo(
}
else {
if (vpu_dev->pendingInst != inst) {
vpu_dev->pendingInst = inst;
vpu_dev->pendingInst = NULL;
LeaveLock(vpu_dev);
return RETCODE_WRONG_CALL_SEQUENCE;
}
......@@ -1585,7 +1585,7 @@ enum RetCode VPU_EncGetOutputInfo(
info->pts = 0LL;
}
vpu_dev->pendingInst = inst;
vpu_dev->pendingInst = NULL;
LeaveLock(vpu_dev);
return ret;
......@@ -1695,7 +1695,7 @@ enum RetCode VPU_EncIssueSeqInit(struct vpu_instance *inst)
}
if (pAttr->supportCommandQueue == TRUE) {
vpu_dev->pendingInst = inst;
vpu_dev->pendingInst = NULL;
LeaveLock(vpu_dev);
}
......@@ -1731,7 +1731,7 @@ enum RetCode VPU_EncCompleteSeqInit(struct vpu_instance *inst, struct EncInitial
}
else {
if (vpu_dev->pendingInst != inst) {
vpu_dev->pendingInst = inst;
vpu_dev->pendingInst = NULL;
LeaveLock(vpu_dev);
return RETCODE_WRONG_CALL_SEQUENCE;
}
......@@ -1744,7 +1744,7 @@ enum RetCode VPU_EncCompleteSeqInit(struct vpu_instance *inst, struct EncInitial
pEncInfo->initialInfo = *info;
vpu_dev->pendingInst = inst;
vpu_dev->pendingInst = NULL;
LeaveLock(vpu_dev);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment