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

Merge commit '31f3e5a5bbdf40aa985c016dbccfc7aa16b3d99f'

Browse Source 
* commit '31f3e5a5bbdf40aa985c016dbccfc7aa16b3d99f':
  media: rockchip: isp: fix mipi drop when isp capture after vpss start
  media: rockchip: isp: fix isp30 stream buf size if enable attach information

Change-Id: Id3b7a0a9893994516ca0639c8069ed228ce86af3
This commit is contained in:
Tao Huang
2024-12-16 19:29:04 +08:00
parent 1ffa5bc702 31f3e5a5bb
commit 64f0047f60
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/platform/rockchip/isp/capture_v30.c
View File

@@ -1170,6 +1170,9 @@ static int rkisp_queue_setup(struct vb2_queue *queue,
plane_fmt->sizeimage / pixm->height *
ALIGN(pixm->height, 16) :
plane_fmt->sizeimage;
/* attach information size */
if (stream->is_attach_info && i == isp_fmt->mplanes - 1)
sizes[i] += sizeof(struct rkisp_frame_info);
}
rkisp_chk_tb_over(dev);

5
drivers/media/platform/rockchip/isp/capture_v39.c
View File

@@ -1423,16 +1423,13 @@ static int rkisp_stream_start(struct rkisp_stream *stream)
{
struct rkisp_device *dev = stream->ispdev;
struct v4l2_device *v4l2_dev = &dev->v4l2_dev;
bool async = false;
bool async = (dev->isp_state & ISP_STOP) ? false : true;
int ret;
stream->need_scl_upd = false;
if (stream->id == RKISP_STREAM_LDC)
goto skip;
async = (dev->cap_dev.stream[RKISP_STREAM_MP].streaming ||
dev->cap_dev.stream[RKISP_STREAM_SP].streaming);
/*
* can't be async now, otherwise the latter started stream fails to
* produce mi interrupt.