diff --git a/drivers/media/platform/rockchip/ispp/procfs.c b/drivers/media/platform/rockchip/ispp/procfs.c index 7b1c7096d1f9..93c890f6c54d 100644 --- a/drivers/media/platform/rockchip/ispp/procfs.c +++ b/drivers/media/platform/rockchip/ispp/procfs.c @@ -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", diff --git a/drivers/media/platform/rockchip/ispp/stream.c b/drivers/media/platform/rockchip/ispp/stream.c index 62b8fb40f021..b2fe994d4c43 100644 --- a/drivers/media/platform/rockchip/ispp/stream.c +++ b/drivers/media/platform/rockchip/ispp/stream.c @@ -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 */