malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

msm: vidc: Correct conditional check

Browse Source 
The buffer type is not bit mask value and hence
do not use bitwise operations for buffer type check.
bitwise check condition sometimes resulting in queuing
input buffer in msm_comm_qbuf_decode_batch() function
which is expected to queue output buffers only.

Change-Id: I73548f725a9f58e5466c9afae226e5f386f126ed
Signed-off-by: Maheshwar Ajja <majja@codeaurora.org>
This commit is contained in:
Maheshwar Ajja 2018-05-30 15:39:35 -07:00
parent d2560a2633
commit dc0c2baa2c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/platform/msm/vidc/msm_vidc_common.c
View File

@ -4188,15 +4188,16 @@ int msm_comm_qbuf_decode_batch(struct msm_vidc_inst *inst,
mutex_lock(&inst->registeredbufs.lock);
list_for_each_entry(buf, &inst->registeredbufs.list, list) {
/* Don't queue if buffer is not CAPTURE_MPLANE */
if (!(buf->vvb.vb2_buf.type &
V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE))
continue;
if (buf->vvb.vb2_buf.type !=
V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)
goto loop_end;
/* Don't queue if buffer is not a deferred buffer */
if (!(buf->flags & MSM_VIDC_FLAG_DEFERRED))
continue;
goto loop_end;
/* Don't queue if RBR event is pending on this buffer */
if (buf->flags & MSM_VIDC_FLAG_RBR_PENDING)
continue;
goto loop_end;
print_vidc_buffer(VIDC_DBG, "batch-qbuf", inst, buf);
rc = msm_comm_qbuf_to_hfi(inst, buf);
if (rc) {
@ -4204,6 +4205,7 @@ int msm_comm_qbuf_decode_batch(struct msm_vidc_inst *inst,
__func__, rc);
break;
}
loop_end:
/* Queue pending buffers till the current buffer only */
if (buf == mbuf)
break;