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

media: rockchip: ispp: disable scl dma write if no output buffer

Browse Source 
Change-Id: I11bbc17dad564510c7cbd37d4ad357f81fe1ecf2
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2021-09-30 08:36:55 +08:00
committed by Tao Huang
parent 9ed21d58a9
commit f0940894ca
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/media/platform/rockchip/ispp/stream.c
View File

@@ -346,7 +346,8 @@ static void check_to_force_update(struct rkispp_device *dev, u32 mis_val)
/* wait nr_shp/fec/scl idle */
for (i = STREAM_S0; i <= STREAM_S2; i++) {
stream = &vdev->stream[i];
if (stream->is_upd && !is_fec_en)
if (stream->is_upd && !is_fec_en &&
rkispp_read(dev, stream->config->reg.ctrl) & SW_SCL_ENABLE)
mask |= stream->config->frame_end_id;
}
@@ -2628,6 +2629,8 @@ static void fec_work_event(struct rkispp_device *dev,
rkispp_update_regs(dev, RKISPP_FEC, RKISPP_FEC_CROP);
writel(FEC_FORCE_UPD, base + RKISPP_CTRL_UPDATE);
if (vdev->nr.is_end) {
if (!dev->hw_dev->is_single)
rkispp_update_regs(dev, RKISPP_SCL0_CTRL, RKISPP_SCL2_FACTOR);
writel(OTHER_FORCE_UPD, base + RKISPP_CTRL_UPDATE);
/* check scale stream stop state */
for (val = STREAM_S0; val <= STREAM_S2; val++) {
@@ -2923,8 +2926,12 @@ static void nr_work_event(struct rkispp_device *dev,
if (!stream->streaming || !stream->is_cfg || stream->curr_buf)
continue;
get_stream_buf(stream);
if (stream->curr_buf)
if (stream->curr_buf) {
update_mi(stream);
rkispp_set_bits(dev, stream->config->reg.ctrl, 0, SW_SCL_ENABLE);
} else {
rkispp_clear_bits(dev, stream->config->reg.ctrl, SW_SCL_ENABLE);
}
}
if (!dev->hw_dev->is_single) {
@@ -2951,8 +2958,16 @@ static void nr_work_event(struct rkispp_device *dev,
for (val = STREAM_S0; val <= STREAM_S2 && !is_fec_en; val++) {
stream = &vdev->stream[val];
if (stream->stopping && stream->ops->stop)
stream->ops->stop(stream);
/* check scale stream stop state */
if (stream->streaming && stream->stopping) {
if (stream->ops->is_stopped(stream)) {
stream->stopping = false;
stream->streaming = false;
wake_up(&stream->done);
} else {
stream->ops->stop(stream);
}
}
}
vdev->nr.dbg.id = seq;