shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: rockchip: isp: fix mp/sp can not get picture in rdbk mode

Browse Source 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Ibf303e6031d4d31a7cc281dff844c1e0e6b3354f
This commit is contained in:
Hu Kejun
2020-05-02 10:46:54 +08:00
committed by Tao Huang
parent 4629acc757
commit bbeb26a30a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/platform/rockchip/isp/capture.c
View File

@@ -1570,16 +1570,14 @@ static int mi_frame_end(struct rkisp_stream *stream)
rkisp_buf_queue(&cap->rdbk_buf[RDBK_L]->vb.vb2_buf);
}
cap->rdbk_buf[RDBK_L] = stream->curr_buf;
}
if (stream->id == RKISP_STREAM_DMATX1) {
} else if (stream->id == RKISP_STREAM_DMATX1) {
if (cap->rdbk_buf[RDBK_M]) {
v4l2_err(&isp_dev->v4l2_dev,
"multiple middle data in hdr frame\n");
rkisp_buf_queue(&cap->rdbk_buf[RDBK_M]->vb.vb2_buf);
}
cap->rdbk_buf[RDBK_M] = stream->curr_buf;
}
if (stream->id == RKISP_STREAM_DMATX2) {
} else if (stream->id == RKISP_STREAM_DMATX2) {
if (cap->rdbk_buf[RDBK_S]) {
v4l2_err(&isp_dev->v4l2_dev,
"multiple short data in hdr frame\n");
@@ -1587,6 +1585,9 @@ static int mi_frame_end(struct rkisp_stream *stream)
}
cap->rdbk_buf[RDBK_S] = stream->curr_buf;
rdbk_frame_end(stream);
} else {
vb2_buffer_done(&stream->curr_buf->vb.vb2_buf,
VB2_BUF_STATE_DONE);
}
}