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

media: rockchip: isp: fix dmatx align and dmarx dt

Browse Source 
csi to ddr is work unit
config damrx data type if dmatx no work

Change-Id: If82bfd06c09b725aa159c13a700c02c34e79a253
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2020-04-30 11:22:42 +08:00
committed by Tao Huang
parent a7ab3b8acb
commit 874374348b
2 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2280,17 +2280,14 @@ rkisp_start_streaming(struct vb2_queue *queue, unsigned int count)
v4l2_dbg(1, rkisp_debug, &dev->v4l2_dev,
"%s %d\n", __func__, stream->id);
if (!stream->linked) {
v4l2_err(v4l2_dev, "link stream first\n");
return -EINVAL;
}
if (WARN_ON(stream->streaming))
return -EBUSY;
atomic_inc(&dev->cap_dev.refcnt);
if (!dev->isp_inp)
if (!dev->isp_inp || !stream->linked) {
v4l2_err(v4l2_dev, "check video link or isp input\n");
goto buffer_done;
}
if (atomic_read(&dev->cap_dev.refcnt) == 1 &&
(dev->isp_inp & INP_CSI || dev->isp_inp & INP_DVP)) {
@@ -2485,9 +2482,11 @@ static int rkisp_set_fmt(struct rkisp_stream *stream,
!dev->csi_dev.memory &&
stream->id != RKISP_STREAM_MP &&
stream->id != RKISP_STREAM_SP)
bytesperline = width * fmt->bpp[i] / 8;
/* compact mode need bytesperline 4byte align */
bytesperline = ALIGN(width * fmt->bpp[i] / 8, 4);
else
bytesperline = width * DIV_ROUND_UP(fmt->bpp[i], 8);
/* stride is only available for sp stream and y plane */
if (stream->id != RKISP_STREAM_SP || i != 0 ||
plane_fmt->bytesperline < bytesperline)

30
drivers/media/platform/rockchip/isp/dmarx.c
View File

@@ -280,6 +280,7 @@ static int rawrd_config_mi(struct rkisp_stream *stream)
{
struct rkisp_device *dev = stream->ispdev;
void __iomem *base = dev->base_addr;
u32 val;
v4l2_dbg(1, rkisp_debug, &dev->v4l2_dev,
"%s id:%d %dx%d\n", __func__,
@@ -287,13 +288,30 @@ static int rawrd_config_mi(struct rkisp_stream *stream)
stream->out_fmt.width,
stream->out_fmt.height);
switch (stream->out_isp_fmt.fourcc) {
case V4L2_PIX_FMT_SRGGB8:
case V4L2_PIX_FMT_SBGGR8:
case V4L2_PIX_FMT_SGRBG8:
case V4L2_PIX_FMT_SGBRG8:
val = CIF_CSI2_DT_RAW8;
break;
case V4L2_PIX_FMT_SRGGB10:
case V4L2_PIX_FMT_SBGGR10:
case V4L2_PIX_FMT_SGRBG10:
case V4L2_PIX_FMT_SGBRG10:
val = CIF_CSI2_DT_RAW10;
break;
default:
val = CIF_CSI2_DT_RAW12;
}
isp_set_bits(base + CSI2RX_DATA_IDS_1,
SW_CSI_ID0(0xff), SW_CSI_ID0(val));
raw_rd_set_pic_size(base,
stream->out_fmt.width,
stream->out_fmt.height);
isp_set_bits(base + CSI2RX_RAW_RD_CTRL, 0,
dev->csi_dev.memory << 2 |
1 << (stream->id - 1));
return 0;
}
@@ -538,14 +556,14 @@ static int dmarx_start_streaming(struct vb2_queue *queue,
struct v4l2_device *v4l2_dev = &dev->v4l2_dev;
int ret = -1;
if (!stream->linked) {
v4l2_err(v4l2_dev, "link stream first\n");
return -EINVAL;
}
if (WARN_ON(stream->streaming))
return -EBUSY;
if (!stream->linked) {
v4l2_err(v4l2_dev, "check video link\n");
goto free_buf_queue;
}
if (atomic_read(&dev->cap_dev.refcnt) < 1) {
v4l2_err(v4l2_dev,
"capture stream should start first\n");