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

media: rockchip: ispp: optimize the frame rate of fec en

Browse Source 
Change-Id: I801e50b7947e55dabadc075b584d7080fc273bdf
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2021-02-06 11:53:19 +08:00
committed by Tao Huang
parent 238c3fcc1a
commit 589cabfc98
3 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/rockchip/ispp/params.c
View File

@@ -547,6 +547,8 @@ static void fec_config(struct rkispp_params_vdev *params_vdev,
fec_data->stat = FEC_BUF_CHIPINUSE;
params_vdev->buf_fec_idx = buf_idx;
rkispp_prepare_buffer(dev, &params_vdev->buf_fec[buf_idx]);
dma_addr = params_vdev->buf_fec[buf_idx].dma_addr;
val = dma_addr + fec_data->meshxf_oft;
rkispp_write(params_vdev->dev, RKISPP_FEC_MESH_XFRA_BASE, val);

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

@@ -711,18 +711,18 @@ static int config_tnr(struct rkispp_device *dev)
GLB_QUICK_MODE_MASK,
GLB_QUICK_MODE(0));
val = vdev->pool[0].dma[GROUP_BUF_PIC];
val = hw->pool[0].dma[GROUP_BUF_PIC];
rkispp_write(dev, RKISPP_TNR_CUR_Y_BASE, val);
rkispp_write(dev, RKISPP_TNR_CUR_UV_BASE, val + addr_offs);
val = vdev->pool[0].dma[GROUP_BUF_GAIN];
val = hw->pool[0].dma[GROUP_BUF_GAIN];
rkispp_write(dev, RKISPP_TNR_GAIN_CUR_Y_BASE, val);
if (vdev->tnr.is_3to1) {
val = vdev->pool[1].dma[GROUP_BUF_PIC];
val = hw->pool[1].dma[GROUP_BUF_PIC];
rkispp_write(dev, RKISPP_TNR_NXT_Y_BASE, val);
rkispp_write(dev, RKISPP_TNR_NXT_UV_BASE, val + addr_offs);
val = vdev->pool[1].dma[GROUP_BUF_GAIN];
val = hw->pool[1].dma[GROUP_BUF_GAIN];
rkispp_write(dev, RKISPP_TNR_GAIN_NXT_Y_BASE, val);
}
}
@@ -883,14 +883,10 @@ static int config_nr_shp(struct rkispp_device *dev)
addr_offs = (fmt & FMT_FBC) ? max_w * max_h >> 4 : max_w * max_h;
pic_size = (fmt & FMT_YUV422) ? w * h * 2 : w * h * 3 >> 1;
vdev->nr.uv_offset = addr_offs;
if (fmt & FMT_FBC)
pic_size += w * h >> 4;
if (fmt & FMT_YUYV)
mult = 2;
if (vdev->module_ens & ISPP_MODULE_FEC)
pic_size = w * h * 2;
ret = nr_init_buf(dev, pic_size);
if (ret)
return ret;
@@ -916,10 +912,10 @@ static int config_nr_shp(struct rkispp_device *dev)
rkispp_set_bits(dev, RKISPP_NR_UVNR_CTRL_PARA,
0, SW_UVNR_SD32_SELF_EN);
val = vdev->pool[0].dma[GROUP_BUF_PIC];
val = hw->pool[0].dma[GROUP_BUF_PIC];
rkispp_write(dev, RKISPP_NR_ADDR_BASE_Y, val);
rkispp_write(dev, RKISPP_NR_ADDR_BASE_UV, val + addr_offs);
val = vdev->pool[0].dma[GROUP_BUF_GAIN];
val = hw->pool[0].dma[GROUP_BUF_GAIN];
rkispp_write(dev, RKISPP_NR_ADDR_BASE_GAIN, val);
rkispp_clear_bits(dev, RKISPP_CTRL_QUICK, GLB_NR_SD32_TNR);
} else if (stream) {
@@ -933,13 +929,13 @@ static int config_nr_shp(struct rkispp_device *dev)
rkispp_clear_bits(dev, RKISPP_CTRL_QUICK, GLB_FEC2SCL_EN);
if (vdev->module_ens & ISPP_MODULE_FEC) {
vdev->fec.uv_offset = 0;
addr_offs = width * height;
vdev->fec.uv_offset = addr_offs;
val = vdev->nr.buf.wr[0].dma_addr;
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 * 2, 16) >> 2);
rkispp_set_bits(dev, RKISPP_SHARP_CTRL,
SW_SHP_WR_FORMAT_MASK, FMT_YUYV | FMT_YUV422);
rkispp_write(dev, RKISPP_SHARP_WR_UV_BASE, val + addr_offs);
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 & (~FMT_FBC));
} else {
stream = &vdev->stream[STREAM_MB];
if (!stream->streaming) {
@@ -1019,7 +1015,6 @@ static int config_fec(struct rkispp_device *dev)
rkispp_read(dev, RKISPP_SHARP_WR_Y_BASE));
rkispp_write(dev, RKISPP_FEC_RD_UV_BASE,
rkispp_read(dev, RKISPP_SHARP_WR_UV_BASE));
fmt = FMT_YUYV | FMT_YUV422;
} else if (stream) {
stream->config->frame_end_id = FEC_INT;
stream->config->reg.cur_y_base = RKISPP_FEC_RD_Y_BASE;
@@ -3048,7 +3043,7 @@ void rkispp_module_work_event(struct rkispp_device *dev,
void *buf_rd, void *buf_wr,
u32 module, bool is_isr)
{
bool is_fec_en = (dev->stream_vdev.module_ens & ISPP_MODULE_FEC);
struct rkispp_stream_vdev *vdev = &dev->stream_vdev;
if (dev->hw_dev->is_shutdown)
return;
@@ -3062,9 +3057,15 @@ void rkispp_module_work_event(struct rkispp_device *dev,
fec_work_event(dev, buf_rd, is_isr);
}
/* cur frame (tnr->nr->fec) done for next frame
* fec start at nr end if fec enable, and fec can async with
* tnr different frames for single device.
* tnr->nr->fec frame0
* |->tnr->nr->fec frame1
*/
if (is_isr && !buf_rd && !buf_wr &&
((is_fec_en && module == ISPP_MODULE_FEC) ||
(!is_fec_en && module == ISPP_MODULE_NR))) {
((module == ISPP_MODULE_FEC && !dev->hw_dev->is_single) ||
(module == ISPP_MODULE_NR && (dev->hw_dev->is_single || vdev->fec.is_end)))) {
dev->stream_vdev.monitor.retry = 0;
rkispp_event_handle(dev, CMD_QUEUE_DMABUF, NULL);
}

8
drivers/media/platform/rockchip/ispp/stream.h
View File

@@ -129,14 +129,6 @@ struct fec_module {
bool is_end;
};
/* fec internal using buf */
struct in_fec_buf {
struct rkispp_dummy_buffer mesh_xint;
struct rkispp_dummy_buffer mesh_yint;
struct rkispp_dummy_buffer mesh_xfra;
struct rkispp_dummy_buffer mesh_yfra;
};
/* struct rkispp_stream - ISPP stream video device
* id: stream video identify
* buf_queue: queued buffer list