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 iommu write failed

Browse Source 
If dmatx no stop, but buffer release will iommu write failed.
Waiting for dmatx stopped when hdr read back by user mode.

Change-Id: I8f9eaa386e0bcd1f01e2bf7457fe1b3b22041bbc
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2020-03-31 11:31:30 +08:00
committed by Tao Huang
parent 38e968cb39
commit ed9580beef
2 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1392,7 +1392,7 @@ static struct streams_ops rkisp2_dmatx0_streams_ops = {
.config_mi = dmatx0_config_mi,
.enable_mi = dmatx_enable_mi,
.stop_mi = dmatx_stop_mi,
.is_stream_stopped = dmatx_is_stream_stopped,
.is_stream_stopped = dmatx0_is_stream_stopped,
.update_mi = update_dmatx_v2,
};
@@ -1400,7 +1400,7 @@ static struct streams_ops rkisp2_dmatx1_streams_ops = {
.config_mi = dmatx1_config_mi,
.enable_mi = dmatx_enable_mi,
.stop_mi = dmatx_stop_mi,
.is_stream_stopped = dmatx_is_stream_stopped,
.is_stream_stopped = dmatx1_is_stream_stopped,
.update_mi = update_dmatx_v2,
};
@@ -1408,7 +1408,7 @@ static struct streams_ops rkisp2_dmatx2_streams_ops = {
.config_mi = dmatx2_config_mi,
.enable_mi = dmatx_enable_mi,
.stop_mi = dmatx_stop_mi,
.is_stream_stopped = dmatx_is_stream_stopped,
.is_stream_stopped = dmatx2_is_stream_stopped,
.update_mi = update_dmatx_v2,
};
@@ -1416,7 +1416,7 @@ static struct streams_ops rkisp2_dmatx3_streams_ops = {
.config_mi = dmatx3_config_mi,
.enable_mi = dmatx_enable_mi,
.stop_mi = dmatx_stop_mi,
.is_stream_stopped = dmatx_is_stream_stopped,
.is_stream_stopped = dmatx3_is_stream_stopped,
.update_mi = update_dmatx_v2,
};
@@ -1748,6 +1748,7 @@ static void rkisp_stream_stop(struct rkisp_stream *stream)
int ret = 0;
if (dev->isp_ver == ISP_V20 &&
!dev->dmarx_dev.trigger &&
((dev->hdr.op_mode == HDR_RDBK_FRAME1 &&
stream->id == RKISP_STREAM_DMATX2) ||
(dev->hdr.op_mode == HDR_RDBK_FRAME2 &&
@@ -1764,8 +1765,7 @@ static void rkisp_stream_stop(struct rkisp_stream *stream)
stream->stopping = true;
stream->ops->stop_mi(stream);
if (dev->isp_state == ISP_START &&
dev->isp_inp != INP_DMARX_ISP &&
!dev->dmarx_dev.trigger) {
dev->isp_inp != INP_DMARX_ISP) {
ret = wait_event_timeout(stream->done,
!stream->streaming,
msecs_to_jiffies(1000));

27
drivers/media/platform/rockchip/isp/regs_v2x.h
View File

@@ -1898,9 +1898,32 @@
#define ISP_ISP_LSC_TABLE_DATA(v0, v1) \
(((v0) & 0x1FFF) | (((v1) & 0x1FFF) << 16))
static inline bool dmatx_is_stream_stopped(void __iomem *base)
static inline bool dmatx0_is_stream_stopped(void __iomem *base)
{
return true;
u32 ret = readl(base + CSI2RX_RAW0_WR_CTRL);
return !(ret & SW_CSI2RX_EN);
}
static inline bool dmatx1_is_stream_stopped(void __iomem *base)
{
u32 ret = readl(base + CSI2RX_RAW1_WR_CTRL);
return !(ret & SW_CSI2RX_EN);
}
static inline bool dmatx2_is_stream_stopped(void __iomem *base)
{
u32 ret = readl(base + CSI2RX_RAW2_WR_CTRL);
return !(ret & SW_CSI2RX_EN);
}
static inline bool dmatx3_is_stream_stopped(void __iomem *base)
{
u32 ret = readl(base + CSI2RX_RAW3_WR_CTRL);
return !(ret & SW_CSI2RX_EN);
}
static inline bool is_mpfbc_stopped(void __iomem *base)