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

media: rockchip: ispp: disable sharp output if it bypass

Browse Source 
Change-Id: I094dcce7ee12f77e5f524a46d9565a63f4523801
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2021-04-20 11:24:55 +08:00
committed by Tao Huang
parent 2ef70c2688
commit ee17c1285b
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/platform/rockchip/ispp/procfs.c
View File

@@ -68,8 +68,8 @@ static int ispp_show(struct seq_file *p, void *v)
seq_printf(p, "%-10s %s(0x%x) (mode: %s) (global gain: %s) (frame:%d time:%dms %s) CNT:0x%x STATE:0x%x\n",
"TNR",
(val & 1) ? "ON" : "OFF", val,
(val & SW_TNR_MODE_SHD) ? "3to1" : "2to1",
(val & SW_TNR_GLB_GAIN_EN_SHD) ? "enable" : "disable",
(val & SW_TNR_MODE) ? "3to1" : "2to1",
(val & SW_TNR_GLB_GAIN_EN) ? "enable" : "disable",
dev->stream_vdev.tnr.dbg.id,
dev->stream_vdev.tnr.dbg.interval / 1000 / 1000,
dev->stream_vdev.tnr.is_end ? "idle" : "working",

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

@@ -937,7 +937,8 @@ static int config_nr_shp(struct rkispp_device *dev)
rkispp_write(dev, RKISPP_SHARP_WR_Y_BASE, val);
rkispp_write(dev, RKISPP_SHARP_WR_UV_BASE, val);
rkispp_write(dev, RKISPP_SHARP_WR_VIR_STRIDE, ALIGN(width * mult, 16) >> 2);
rkispp_set_bits(dev, RKISPP_SHARP_CTRL, SW_SHP_WR_FORMAT_MASK, FMT_FBC);
if (dev->inp == INP_ISP)
rkispp_set_bits(dev, RKISPP_SHARP_CTRL, SW_SHP_WR_FORMAT_MASK, FMT_FBC);
}
}
@@ -1274,7 +1275,8 @@ static int is_stopped_mb(struct rkispp_stream *stream)
val = dev->hw_dev->dummy_buf.dma_addr;
rkispp_write(dev, RKISPP_SHARP_WR_Y_BASE, val);
rkispp_write(dev, RKISPP_SHARP_WR_UV_BASE, val);
rkispp_set_bits(dev, RKISPP_SHARP_CTRL, SW_SHP_WR_FORMAT_MASK, FMT_FBC);
if (dev->inp == INP_ISP)
rkispp_set_bits(dev, RKISPP_SHARP_CTRL, SW_SHP_WR_FORMAT_MASK, FMT_FBC);
}
/* for wait last frame */