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

media: rockchip: isp: support mesh buf count from user for isp30 and isp32

Browse Source 
Change-Id: If2473f0a040f97786833fdfdadb2928e5092a575
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2022-06-15 20:26:06 +08:00
committed by Tao Huang
parent 970efca023
commit d46850b0ab
3 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/media/platform/rockchip/isp/isp_params_v32.c
View File

@@ -2693,6 +2693,7 @@ static void
isp_3dlut_config(struct rkisp_isp_params_vdev *params_vdev,
const struct isp2x_3dlut_cfg *arg)
{
struct rkisp_device *dev = params_vdev->dev;
struct rkisp_isp_params_val_v32 *priv_val;
u32 value, buf_idx, i;
u32 *data;
@@ -2700,6 +2701,10 @@ isp_3dlut_config(struct rkisp_isp_params_vdev *params_vdev,
priv_val = (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
buf_idx = (priv_val->buf_3dlut_idx++) % ISP32_3DLUT_BUF_NUM;
if (!priv_val->buf_3dlut[buf_idx].vaddr) {
dev_err(dev->dev, "no find 3dlut buf\n");
return;
}
data = (u32 *)priv_val->buf_3dlut[buf_idx].vaddr;
for (i = 0; i < arg->actual_size; i++)
data[i] = (arg->lut_b[i] & 0x3FF) |
@@ -2724,6 +2729,7 @@ isp_3dlut_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
{
u32 value;
bool en_state;
struct rkisp_isp_params_val_v32 *priv_val;
value = isp3_param_read(params_vdev, ISP3X_3DLUT_CTRL);
en_state = (value & ISP3X_3DLUT_EN) ? true : false;
@@ -2731,7 +2737,8 @@ isp_3dlut_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
if (en == en_state)
return;
if (en) {
priv_val = (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
if (en && priv_val->buf_3dlut[0].vaddr) {
isp3_param_set_bits(params_vdev, ISP3X_3DLUT_CTRL, 0x01);
isp3_param_set_bits(params_vdev, ISP3X_3DLUT_UPDATE, 0x01);
} else {
@@ -2770,6 +2777,8 @@ isp_ldch_config(struct rkisp_isp_params_vdev *params_vdev,
priv_val = (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
for (i = 0; i < ISP32_MESH_BUF_NUM; i++) {
if (!priv_val->buf_ldch[i].mem_priv)
continue;
if (arg->buf_fd == priv_val->buf_ldch[i].dma_fd)
break;
}
@@ -3476,6 +3485,8 @@ isp_cac_config(struct rkisp_isp_params_vdev *params_vdev,
isp3_param_write(params_vdev, val, ISP32_CAC_EXPO_ADJ_R);
for (i = 0; i < ISP32_MESH_BUF_NUM; i++) {
if (!priv_val->buf_cac[i].mem_priv)
continue;
if (arg->buf_fd == priv_val->buf_cac[i].dma_fd)
break;
}
@@ -4284,7 +4295,7 @@ static int rkisp_init_mesh_buf(struct rkisp_isp_params_vdev *params_vdev,
u32 mesh_w = meshsize->meas_width;
u32 mesh_h = meshsize->meas_height;
u32 mesh_size, buf_size;
int i, ret;
int i, ret, buf_cnt = meshsize->buf_cnt;
priv_val = params_vdev->priv_val;
if (!priv_val) {
@@ -4310,8 +4321,10 @@ static int rkisp_init_mesh_buf(struct rkisp_isp_params_vdev *params_vdev,
break;
}
if (buf_cnt <= 0 || buf_cnt > ISP32_MESH_BUF_NUM)
buf_cnt = ISP32_MESH_BUF_NUM;
buf_size = PAGE_ALIGN(mesh_size + ALIGN(sizeof(struct isp2x_mesh_head), 16));
for (i = 0; i < ISP32_MESH_BUF_NUM; i++) {
for (i = 0; i < buf_cnt; i++) {
buf->is_need_vaddr = true;
buf->is_need_dbuf = true;
buf->is_need_dmafd = true;
@@ -4561,8 +4574,8 @@ module_data_abandon(struct rkisp_isp_params_vdev *params_vdev,
const struct isp32_ldch_cfg *arg = &params->others.ldch_cfg;
for (i = 0; i < ISP32_MESH_BUF_NUM; i++) {
if (arg->buf_fd == priv_val->buf_ldch[i].dma_fd &&
priv_val->buf_ldch[i].vaddr) {
if (priv_val->buf_ldch[i].vaddr &&
arg->buf_fd == priv_val->buf_ldch[i].dma_fd) {
mesh_head = (struct isp2x_mesh_head *)priv_val->buf_ldch[i].vaddr;
mesh_head->stat = MESH_BUF_CHIPINUSE;
break;
@@ -4574,8 +4587,8 @@ module_data_abandon(struct rkisp_isp_params_vdev *params_vdev,
const struct isp32_cac_cfg *arg = &params->others.cac_cfg;
for (i = 0; i < ISP32_MESH_BUF_NUM; i++) {
if (arg->buf_fd == priv_val->buf_cac[i].dma_fd &&
priv_val->buf_cac[i].vaddr) {
if (priv_val->buf_cac[i].vaddr &&
arg->buf_fd == priv_val->buf_cac[i].dma_fd) {
mesh_head = (struct isp2x_mesh_head *)priv_val->buf_cac[i].vaddr;
mesh_head->stat = MESH_BUF_CHIPINUSE;
break;

26
drivers/media/platform/rockchip/isp/isp_params_v3x.c
View File

@@ -2912,6 +2912,7 @@ static void
isp_3dlut_config(struct rkisp_isp_params_vdev *params_vdev,
const struct isp2x_3dlut_cfg *arg, u32 id)
{
struct rkisp_device *dev = params_vdev->dev;
struct rkisp_isp_params_val_v3x *priv_val;
u32 value, buf_idx, i;
u32 *data;
@@ -2919,6 +2920,10 @@ isp_3dlut_config(struct rkisp_isp_params_vdev *params_vdev,
priv_val = (struct rkisp_isp_params_val_v3x *)params_vdev->priv_val;
buf_idx = (priv_val->buf_3dlut_idx[id]++) % ISP3X_3DLUT_BUF_NUM;
if (!priv_val->buf_3dlut[id][buf_idx].vaddr) {
dev_err(dev->dev, "no find 3dlut buf\n");
return;
}
data = (u32 *)priv_val->buf_3dlut[id][buf_idx].vaddr;
for (i = 0; i < arg->actual_size; i++)
data[i] = (arg->lut_b[i] & 0x3FF) |
@@ -2943,6 +2948,7 @@ isp_3dlut_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
u32 value;
bool en_state;
struct rkisp_isp_params_val_v3x *priv_val;
value = isp3_param_read(params_vdev, ISP3X_3DLUT_CTRL, id);
en_state = (value & ISP3X_3DLUT_EN) ? true : false;
@@ -2950,7 +2956,8 @@ isp_3dlut_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
if (en == en_state)
return;
if (en) {
priv_val = (struct rkisp_isp_params_val_v3x *)params_vdev->priv_val;
if (en && priv_val->buf_3dlut[id][0].vaddr) {
isp3_param_set_bits(params_vdev, ISP3X_3DLUT_CTRL, 0x01, id);
isp3_param_set_bits(params_vdev, ISP3X_3DLUT_UPDATE, 0x01, id);
} else {
@@ -2972,6 +2979,8 @@ isp_ldch_config(struct rkisp_isp_params_vdev *params_vdev,
priv_val = (struct rkisp_isp_params_val_v3x *)params_vdev->priv_val;
for (i = 0; i < ISP3X_MESH_BUF_NUM; i++) {
if (!priv_val->buf_ldch[id][i].mem_priv)
continue;
if (arg->buf_fd == priv_val->buf_ldch[id][i].dma_fd)
break;
}
@@ -3600,6 +3609,8 @@ isp_cac_config(struct rkisp_isp_params_vdev *params_vdev,
}
for (i = 0; i < ISP3X_MESH_BUF_NUM; i++) {
if (!priv_val->buf_cac[id][i].mem_priv)
continue;
if (arg->buf_fd == priv_val->buf_cac[id][i].dma_fd)
break;
}
@@ -4328,6 +4339,7 @@ static int rkisp_init_mesh_buf(struct rkisp_isp_params_vdev *params_vdev,
u32 mesh_h = meshsize->meas_height;
u32 mesh_size, buf_size;
int i, ret, id = meshsize->unite_isp_id;
int buf_cnt = meshsize->buf_cnt;
priv_val = params_vdev->priv_val;
if (!priv_val) {
@@ -4353,8 +4365,10 @@ static int rkisp_init_mesh_buf(struct rkisp_isp_params_vdev *params_vdev,
break;
}
if (buf_cnt <= 0 || buf_cnt > ISP3X_MESH_BUF_NUM)
buf_cnt = ISP3X_MESH_BUF_NUM;
buf_size = PAGE_ALIGN(mesh_size + ALIGN(sizeof(struct isp2x_mesh_head), 16));
for (i = 0; i < ISP3X_MESH_BUF_NUM; i++) {
for (i = 0; i < buf_cnt; i++) {
buf->is_need_vaddr = true;
buf->is_need_dbuf = true;
buf->is_need_dmafd = true;
@@ -4501,8 +4515,8 @@ module_data_abandon(struct rkisp_isp_params_vdev *params_vdev,
const struct isp2x_ldch_cfg *arg = &params->others.ldch_cfg;
for (i = 0; i < ISP3X_MESH_BUF_NUM; i++) {
if (arg->buf_fd == priv_val->buf_ldch[id][i].dma_fd &&
priv_val->buf_ldch[id][i].vaddr) {
if (priv_val->buf_ldch[id][i].vaddr &&
arg->buf_fd == priv_val->buf_ldch[id][i].dma_fd) {
mesh_head = (struct isp2x_mesh_head *)priv_val->buf_ldch[id][i].vaddr;
mesh_head->stat = MESH_BUF_CHIPINUSE;
break;
@@ -4514,8 +4528,8 @@ module_data_abandon(struct rkisp_isp_params_vdev *params_vdev,
const struct isp3x_cac_cfg *arg = &params->others.cac_cfg;
for (i = 0; i < ISP3X_MESH_BUF_NUM; i++) {
if (arg->buf_fd == priv_val->buf_cac[id][i].dma_fd &&
priv_val->buf_cac[id][i].vaddr) {
if (priv_val->buf_cac[id][i].vaddr &&
arg->buf_fd == priv_val->buf_cac[id][i].dma_fd) {
mesh_head = (struct isp2x_mesh_head *)priv_val->buf_cac[id][i].vaddr;
mesh_head->stat = MESH_BUF_CHIPINUSE;
break;

1
include/uapi/linux/rkisp2-config.h
View File

@@ -301,6 +301,7 @@ struct rkisp_meshbuf_size {
u32 unite_isp_id;
u32 meas_width;
u32 meas_height;
int buf_cnt;
} __attribute__ ((packed));
struct isp2x_mesh_head {