* [PATCH 0/5] media: rkisp1: Fix LSC initial configuration on i.MX8MP
@ 2022-08-17 2:18 ` Laurent Pinchart
0 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-08-17 2:18 UTC (permalink / raw)
To: linux-media
Cc: Dafna Hirschfeld, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
Hello,
This patch series fixes the Lens Shading Correction initial
configuration on the i.MX8MP.
The i.MX8MP integrates an ISP8000Nano v18.02, which unlike other
versions currently supported by the driver, gates access to the LSC RAM
with the ISP_CTRL.ISP_ENABLE bit. The initial LSC configuration being
performed before the ISP gets enabled, the writes to the RAM are
ignored, leading to incorrect results.
The series starts with four small drive-by cleanups of the LSC code, and
patch 5/5 then fixes the issue. I'm not totally thrilled by the code
architecture, but I'm not sure why, and I have a feeling doing better
would require a large refactoring of the ISP parameters handling. If
anyone sees an option for a better implementation, please say so.
The series is based on top of "[PATCH 0/7] media: rkisp1: Fix and
improve color space support" ([1]). Reviews for that base series would
thus be appreciated too.
[1] https://lore.kernel.org/linux-media/20220815065235.23797-1-laurent.pinchart@ideasonboard.com
Laurent Pinchart (5):
media: rkisp1: Clean up LSC configuration code
media: rkisp1: Store LSC register values in u32 variables
media: rkisp1: Simplify LSC x/y size and grad register macros
media: rkisp1: Use RKISP1_CIF_ISP_LSC_GRAD_SIZE() for gradient
registers
media: rkisp1: Configure LSC after enabling the ISP
.../platform/rockchip/rkisp1/rkisp1-common.h | 29 +-
.../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
.../platform/rockchip/rkisp1/rkisp1-params.c | 378 ++++++++++--------
.../platform/rockchip/rkisp1/rkisp1-regs.h | 20 +-
4 files changed, 239 insertions(+), 197 deletions(-)
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH 0/5] media: rkisp1: Fix LSC initial configuration on i.MX8MP
@ 2022-08-17 2:18 ` Laurent Pinchart
0 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-08-17 2:18 UTC (permalink / raw)
To: linux-media
Cc: Dafna Hirschfeld, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
Hello,
This patch series fixes the Lens Shading Correction initial
configuration on the i.MX8MP.
The i.MX8MP integrates an ISP8000Nano v18.02, which unlike other
versions currently supported by the driver, gates access to the LSC RAM
with the ISP_CTRL.ISP_ENABLE bit. The initial LSC configuration being
performed before the ISP gets enabled, the writes to the RAM are
ignored, leading to incorrect results.
The series starts with four small drive-by cleanups of the LSC code, and
patch 5/5 then fixes the issue. I'm not totally thrilled by the code
architecture, but I'm not sure why, and I have a feeling doing better
would require a large refactoring of the ISP parameters handling. If
anyone sees an option for a better implementation, please say so.
The series is based on top of "[PATCH 0/7] media: rkisp1: Fix and
improve color space support" ([1]). Reviews for that base series would
thus be appreciated too.
[1] https://lore.kernel.org/linux-media/20220815065235.23797-1-laurent.pinchart@ideasonboard.com
Laurent Pinchart (5):
media: rkisp1: Clean up LSC configuration code
media: rkisp1: Store LSC register values in u32 variables
media: rkisp1: Simplify LSC x/y size and grad register macros
media: rkisp1: Use RKISP1_CIF_ISP_LSC_GRAD_SIZE() for gradient
registers
media: rkisp1: Configure LSC after enabling the ISP
.../platform/rockchip/rkisp1/rkisp1-common.h | 29 +-
.../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
.../platform/rockchip/rkisp1/rkisp1-params.c | 378 ++++++++++--------
.../platform/rockchip/rkisp1/rkisp1-regs.h | 20 +-
4 files changed, 239 insertions(+), 197 deletions(-)
--
Regards,
Laurent Pinchart
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH 1/5] media: rkisp1: Clean up LSC configuration code
2022-08-17 2:18 ` Laurent Pinchart
@ 2022-08-17 2:18 ` Laurent Pinchart
-1 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-08-17 2:18 UTC (permalink / raw)
To: linux-media
Cc: Dafna Hirschfeld, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
Clean up the LSC configuration code to improve its readability by
shortening lines, using extra local variables and renaming long
variables. No functional change intended.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
.../platform/rockchip/rkisp1/rkisp1-params.c | 199 ++++++++----------
1 file changed, 86 insertions(+), 113 deletions(-)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
index 246a6faa1fc1..fbbaf5505291 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
@@ -198,149 +198,129 @@ static void
rkisp1_lsc_matrix_config_v10(struct rkisp1_params *params,
const struct rkisp1_cif_isp_lsc_config *pconfig)
{
- unsigned int isp_lsc_status, sram_addr, isp_lsc_table_sel, i, j, data;
+ struct rkisp1_device *rkisp1 = params->rkisp1;
+ unsigned int lsc_status, sram_addr, lsc_table_sel, i, j;
- isp_lsc_status = rkisp1_read(params->rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
+ lsc_status = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
/* RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_153 = ( 17 * 18 ) >> 1 */
- sram_addr = (isp_lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE) ?
+ sram_addr = lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE ?
RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_0 :
RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_153;
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_ADDR, sram_addr);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_ADDR, sram_addr);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_ADDR, sram_addr);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_ADDR, sram_addr);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_ADDR, sram_addr);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_ADDR, sram_addr);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_ADDR, sram_addr);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_ADDR, sram_addr);
/* program data tables (table size is 9 * 17 = 153) */
for (i = 0; i < RKISP1_CIF_ISP_LSC_SAMPLES_MAX; i++) {
+ const __u16 *r_tbl = pconfig->r_data_tbl[i];
+ const __u16 *gr_tbl = pconfig->gr_data_tbl[i];
+ const __u16 *gb_tbl = pconfig->gb_data_tbl[i];
+ const __u16 *b_tbl = pconfig->b_data_tbl[i];
+
/*
* 17 sectors with 2 values in one DWORD = 9
* DWORDs (2nd value of last DWORD unused)
*/
for (j = 0; j < RKISP1_CIF_ISP_LSC_SAMPLES_MAX - 1; j += 2) {
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->r_data_tbl[i][j],
- pconfig->r_data_tbl[i][j + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_R_TABLE_DATA, data);
-
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->gr_data_tbl[i][j],
- pconfig->gr_data_tbl[i][j + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_GR_TABLE_DATA, data);
-
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->gb_data_tbl[i][j],
- pconfig->gb_data_tbl[i][j + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_GB_TABLE_DATA, data);
-
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->b_data_tbl[i][j],
- pconfig->b_data_tbl[i][j + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_B_TABLE_DATA, data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(
+ r_tbl[j], r_tbl[j + 1]));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(
+ gr_tbl[j], gr_tbl[j + 1]));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(
+ gb_tbl[j], gb_tbl[j + 1]));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(
+ b_tbl[j], b_tbl[j + 1]));
}
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->r_data_tbl[i][j], 0);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
- data);
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->gr_data_tbl[i][j], 0);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
- data);
-
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->gb_data_tbl[i][j], 0);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
- data);
-
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->b_data_tbl[i][j], 0);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
- data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(r_tbl[j], 0));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(gr_tbl[j], 0));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(gb_tbl[j], 0));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(b_tbl[j], 0));
}
- isp_lsc_table_sel = (isp_lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE) ?
- RKISP1_CIF_ISP_LSC_TABLE_0 :
- RKISP1_CIF_ISP_LSC_TABLE_1;
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_TABLE_SEL,
- isp_lsc_table_sel);
+
+ lsc_table_sel = lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE ?
+ RKISP1_CIF_ISP_LSC_TABLE_0 : RKISP1_CIF_ISP_LSC_TABLE_1;
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_TABLE_SEL, lsc_table_sel);
}
static void
rkisp1_lsc_matrix_config_v12(struct rkisp1_params *params,
const struct rkisp1_cif_isp_lsc_config *pconfig)
{
- unsigned int isp_lsc_status, sram_addr, isp_lsc_table_sel, i, j, data;
+ struct rkisp1_device *rkisp1 = params->rkisp1;
+ unsigned int lsc_status, sram_addr, lsc_table_sel, i, j;
- isp_lsc_status = rkisp1_read(params->rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
+ lsc_status = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
/* RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_153 = ( 17 * 18 ) >> 1 */
- sram_addr = (isp_lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE) ?
- RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_0 :
- RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_153;
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_ADDR, sram_addr);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_ADDR, sram_addr);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_ADDR, sram_addr);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_ADDR, sram_addr);
+ sram_addr = lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE ?
+ RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_0 :
+ RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_153;
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_ADDR, sram_addr);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_ADDR, sram_addr);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_ADDR, sram_addr);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_ADDR, sram_addr);
/* program data tables (table size is 9 * 17 = 153) */
for (i = 0; i < RKISP1_CIF_ISP_LSC_SAMPLES_MAX; i++) {
+ const __u16 *r_tbl = pconfig->r_data_tbl[i];
+ const __u16 *gr_tbl = pconfig->gr_data_tbl[i];
+ const __u16 *gb_tbl = pconfig->gb_data_tbl[i];
+ const __u16 *b_tbl = pconfig->b_data_tbl[i];
+
/*
* 17 sectors with 2 values in one DWORD = 9
* DWORDs (2nd value of last DWORD unused)
*/
for (j = 0; j < RKISP1_CIF_ISP_LSC_SAMPLES_MAX - 1; j += 2) {
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
- pconfig->r_data_tbl[i][j],
- pconfig->r_data_tbl[i][j + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_R_TABLE_DATA, data);
-
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
- pconfig->gr_data_tbl[i][j],
- pconfig->gr_data_tbl[i][j + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_GR_TABLE_DATA, data);
-
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
- pconfig->gb_data_tbl[i][j],
- pconfig->gb_data_tbl[i][j + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_GB_TABLE_DATA, data);
-
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
- pconfig->b_data_tbl[i][j],
- pconfig->b_data_tbl[i][j + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_B_TABLE_DATA, data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
+ r_tbl[j], r_tbl[j + 1]));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
+ gr_tbl[j], gr_tbl[j + 1]));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
+ gb_tbl[j], gb_tbl[j + 1]));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
+ b_tbl[j], b_tbl[j + 1]));
}
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(pconfig->r_data_tbl[i][j], 0);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
- data);
-
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(pconfig->gr_data_tbl[i][j], 0);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
- data);
-
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(pconfig->gb_data_tbl[i][j], 0);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
- data);
-
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(pconfig->b_data_tbl[i][j], 0);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
- data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(r_tbl[j], 0));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(gr_tbl[j], 0));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(gb_tbl[j], 0));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(b_tbl[j], 0));
}
- isp_lsc_table_sel = (isp_lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE) ?
- RKISP1_CIF_ISP_LSC_TABLE_0 :
- RKISP1_CIF_ISP_LSC_TABLE_1;
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_TABLE_SEL,
- isp_lsc_table_sel);
+
+ lsc_table_sel = lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE ?
+ RKISP1_CIF_ISP_LSC_TABLE_0 : RKISP1_CIF_ISP_LSC_TABLE_1;
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_TABLE_SEL, lsc_table_sel);
}
static void rkisp1_lsc_config(struct rkisp1_params *params,
const struct rkisp1_cif_isp_lsc_config *arg)
{
+ struct rkisp1_device *rkisp1 = params->rkisp1;
unsigned int i, data;
u32 lsc_ctrl;
/* To config must be off , store the current status firstly */
- lsc_ctrl = rkisp1_read(params->rkisp1, RKISP1_CIF_ISP_LSC_CTRL);
+ lsc_ctrl = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_CTRL);
rkisp1_param_clear_bits(params, RKISP1_CIF_ISP_LSC_CTRL,
RKISP1_CIF_ISP_LSC_CTRL_ENA);
params->ops->lsc_matrix_config(params, arg);
@@ -349,38 +329,31 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
/* program x size tables */
data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_size_tbl[i * 2],
arg->x_size_tbl[i * 2 + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_XSIZE_01 + i * 4, data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE_01 + i * 4, data);
/* program x grad tables */
data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2],
arg->x_grad_tbl[i * 2 + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_XGRAD_01 + i * 4, data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD_01 + i * 4, data);
/* program y size tables */
data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_size_tbl[i * 2],
arg->y_size_tbl[i * 2 + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_YSIZE_01 + i * 4, data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE_01 + i * 4, data);
/* program y grad tables */
data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2],
arg->y_grad_tbl[i * 2 + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_YGRAD_01 + i * 4, data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD_01 + i * 4, data);
}
/* restore the lsc ctrl status */
- if (lsc_ctrl & RKISP1_CIF_ISP_LSC_CTRL_ENA) {
- rkisp1_param_set_bits(params,
- RKISP1_CIF_ISP_LSC_CTRL,
+ if (lsc_ctrl & RKISP1_CIF_ISP_LSC_CTRL_ENA)
+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_LSC_CTRL,
RKISP1_CIF_ISP_LSC_CTRL_ENA);
- } else {
- rkisp1_param_clear_bits(params,
- RKISP1_CIF_ISP_LSC_CTRL,
+ else
+ rkisp1_param_clear_bits(params, RKISP1_CIF_ISP_LSC_CTRL,
RKISP1_CIF_ISP_LSC_CTRL_ENA);
- }
}
/* ISP Filtering function */
--
Regards,
Laurent Pinchart
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 1/5] media: rkisp1: Clean up LSC configuration code
@ 2022-08-17 2:18 ` Laurent Pinchart
0 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-08-17 2:18 UTC (permalink / raw)
To: linux-media
Cc: Dafna Hirschfeld, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
Clean up the LSC configuration code to improve its readability by
shortening lines, using extra local variables and renaming long
variables. No functional change intended.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
.../platform/rockchip/rkisp1/rkisp1-params.c | 199 ++++++++----------
1 file changed, 86 insertions(+), 113 deletions(-)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
index 246a6faa1fc1..fbbaf5505291 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
@@ -198,149 +198,129 @@ static void
rkisp1_lsc_matrix_config_v10(struct rkisp1_params *params,
const struct rkisp1_cif_isp_lsc_config *pconfig)
{
- unsigned int isp_lsc_status, sram_addr, isp_lsc_table_sel, i, j, data;
+ struct rkisp1_device *rkisp1 = params->rkisp1;
+ unsigned int lsc_status, sram_addr, lsc_table_sel, i, j;
- isp_lsc_status = rkisp1_read(params->rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
+ lsc_status = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
/* RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_153 = ( 17 * 18 ) >> 1 */
- sram_addr = (isp_lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE) ?
+ sram_addr = lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE ?
RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_0 :
RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_153;
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_ADDR, sram_addr);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_ADDR, sram_addr);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_ADDR, sram_addr);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_ADDR, sram_addr);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_ADDR, sram_addr);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_ADDR, sram_addr);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_ADDR, sram_addr);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_ADDR, sram_addr);
/* program data tables (table size is 9 * 17 = 153) */
for (i = 0; i < RKISP1_CIF_ISP_LSC_SAMPLES_MAX; i++) {
+ const __u16 *r_tbl = pconfig->r_data_tbl[i];
+ const __u16 *gr_tbl = pconfig->gr_data_tbl[i];
+ const __u16 *gb_tbl = pconfig->gb_data_tbl[i];
+ const __u16 *b_tbl = pconfig->b_data_tbl[i];
+
/*
* 17 sectors with 2 values in one DWORD = 9
* DWORDs (2nd value of last DWORD unused)
*/
for (j = 0; j < RKISP1_CIF_ISP_LSC_SAMPLES_MAX - 1; j += 2) {
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->r_data_tbl[i][j],
- pconfig->r_data_tbl[i][j + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_R_TABLE_DATA, data);
-
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->gr_data_tbl[i][j],
- pconfig->gr_data_tbl[i][j + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_GR_TABLE_DATA, data);
-
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->gb_data_tbl[i][j],
- pconfig->gb_data_tbl[i][j + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_GB_TABLE_DATA, data);
-
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->b_data_tbl[i][j],
- pconfig->b_data_tbl[i][j + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_B_TABLE_DATA, data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(
+ r_tbl[j], r_tbl[j + 1]));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(
+ gr_tbl[j], gr_tbl[j + 1]));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(
+ gb_tbl[j], gb_tbl[j + 1]));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(
+ b_tbl[j], b_tbl[j + 1]));
}
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->r_data_tbl[i][j], 0);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
- data);
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->gr_data_tbl[i][j], 0);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
- data);
-
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->gb_data_tbl[i][j], 0);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
- data);
-
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->b_data_tbl[i][j], 0);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
- data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(r_tbl[j], 0));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(gr_tbl[j], 0));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(gb_tbl[j], 0));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(b_tbl[j], 0));
}
- isp_lsc_table_sel = (isp_lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE) ?
- RKISP1_CIF_ISP_LSC_TABLE_0 :
- RKISP1_CIF_ISP_LSC_TABLE_1;
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_TABLE_SEL,
- isp_lsc_table_sel);
+
+ lsc_table_sel = lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE ?
+ RKISP1_CIF_ISP_LSC_TABLE_0 : RKISP1_CIF_ISP_LSC_TABLE_1;
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_TABLE_SEL, lsc_table_sel);
}
static void
rkisp1_lsc_matrix_config_v12(struct rkisp1_params *params,
const struct rkisp1_cif_isp_lsc_config *pconfig)
{
- unsigned int isp_lsc_status, sram_addr, isp_lsc_table_sel, i, j, data;
+ struct rkisp1_device *rkisp1 = params->rkisp1;
+ unsigned int lsc_status, sram_addr, lsc_table_sel, i, j;
- isp_lsc_status = rkisp1_read(params->rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
+ lsc_status = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
/* RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_153 = ( 17 * 18 ) >> 1 */
- sram_addr = (isp_lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE) ?
- RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_0 :
- RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_153;
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_ADDR, sram_addr);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_ADDR, sram_addr);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_ADDR, sram_addr);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_ADDR, sram_addr);
+ sram_addr = lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE ?
+ RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_0 :
+ RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_153;
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_ADDR, sram_addr);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_ADDR, sram_addr);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_ADDR, sram_addr);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_ADDR, sram_addr);
/* program data tables (table size is 9 * 17 = 153) */
for (i = 0; i < RKISP1_CIF_ISP_LSC_SAMPLES_MAX; i++) {
+ const __u16 *r_tbl = pconfig->r_data_tbl[i];
+ const __u16 *gr_tbl = pconfig->gr_data_tbl[i];
+ const __u16 *gb_tbl = pconfig->gb_data_tbl[i];
+ const __u16 *b_tbl = pconfig->b_data_tbl[i];
+
/*
* 17 sectors with 2 values in one DWORD = 9
* DWORDs (2nd value of last DWORD unused)
*/
for (j = 0; j < RKISP1_CIF_ISP_LSC_SAMPLES_MAX - 1; j += 2) {
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
- pconfig->r_data_tbl[i][j],
- pconfig->r_data_tbl[i][j + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_R_TABLE_DATA, data);
-
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
- pconfig->gr_data_tbl[i][j],
- pconfig->gr_data_tbl[i][j + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_GR_TABLE_DATA, data);
-
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
- pconfig->gb_data_tbl[i][j],
- pconfig->gb_data_tbl[i][j + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_GB_TABLE_DATA, data);
-
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
- pconfig->b_data_tbl[i][j],
- pconfig->b_data_tbl[i][j + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_B_TABLE_DATA, data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
+ r_tbl[j], r_tbl[j + 1]));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
+ gr_tbl[j], gr_tbl[j + 1]));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
+ gb_tbl[j], gb_tbl[j + 1]));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
+ b_tbl[j], b_tbl[j + 1]));
}
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(pconfig->r_data_tbl[i][j], 0);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
- data);
-
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(pconfig->gr_data_tbl[i][j], 0);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
- data);
-
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(pconfig->gb_data_tbl[i][j], 0);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
- data);
-
- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(pconfig->b_data_tbl[i][j], 0);
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
- data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(r_tbl[j], 0));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(gr_tbl[j], 0));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(gb_tbl[j], 0));
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(b_tbl[j], 0));
}
- isp_lsc_table_sel = (isp_lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE) ?
- RKISP1_CIF_ISP_LSC_TABLE_0 :
- RKISP1_CIF_ISP_LSC_TABLE_1;
- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_TABLE_SEL,
- isp_lsc_table_sel);
+
+ lsc_table_sel = lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE ?
+ RKISP1_CIF_ISP_LSC_TABLE_0 : RKISP1_CIF_ISP_LSC_TABLE_1;
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_TABLE_SEL, lsc_table_sel);
}
static void rkisp1_lsc_config(struct rkisp1_params *params,
const struct rkisp1_cif_isp_lsc_config *arg)
{
+ struct rkisp1_device *rkisp1 = params->rkisp1;
unsigned int i, data;
u32 lsc_ctrl;
/* To config must be off , store the current status firstly */
- lsc_ctrl = rkisp1_read(params->rkisp1, RKISP1_CIF_ISP_LSC_CTRL);
+ lsc_ctrl = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_CTRL);
rkisp1_param_clear_bits(params, RKISP1_CIF_ISP_LSC_CTRL,
RKISP1_CIF_ISP_LSC_CTRL_ENA);
params->ops->lsc_matrix_config(params, arg);
@@ -349,38 +329,31 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
/* program x size tables */
data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_size_tbl[i * 2],
arg->x_size_tbl[i * 2 + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_XSIZE_01 + i * 4, data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE_01 + i * 4, data);
/* program x grad tables */
data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2],
arg->x_grad_tbl[i * 2 + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_XGRAD_01 + i * 4, data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD_01 + i * 4, data);
/* program y size tables */
data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_size_tbl[i * 2],
arg->y_size_tbl[i * 2 + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_YSIZE_01 + i * 4, data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE_01 + i * 4, data);
/* program y grad tables */
data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2],
arg->y_grad_tbl[i * 2 + 1]);
- rkisp1_write(params->rkisp1,
- RKISP1_CIF_ISP_LSC_YGRAD_01 + i * 4, data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD_01 + i * 4, data);
}
/* restore the lsc ctrl status */
- if (lsc_ctrl & RKISP1_CIF_ISP_LSC_CTRL_ENA) {
- rkisp1_param_set_bits(params,
- RKISP1_CIF_ISP_LSC_CTRL,
+ if (lsc_ctrl & RKISP1_CIF_ISP_LSC_CTRL_ENA)
+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_LSC_CTRL,
RKISP1_CIF_ISP_LSC_CTRL_ENA);
- } else {
- rkisp1_param_clear_bits(params,
- RKISP1_CIF_ISP_LSC_CTRL,
+ else
+ rkisp1_param_clear_bits(params, RKISP1_CIF_ISP_LSC_CTRL,
RKISP1_CIF_ISP_LSC_CTRL_ENA);
- }
}
/* ISP Filtering function */
--
Regards,
Laurent Pinchart
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 2/5] media: rkisp1: Store LSC register values in u32 variables
2022-08-17 2:18 ` Laurent Pinchart
@ 2022-08-17 2:18 ` Laurent Pinchart
-1 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-08-17 2:18 UTC (permalink / raw)
To: linux-media
Cc: Dafna Hirschfeld, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
Use the u32 type instead of unsigned int to store register values in the
LSC configuration code, to make the variables' size more explicit. No
functional change intended.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/media/platform/rockchip/rkisp1/rkisp1-params.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
index fbbaf5505291..dbe826fd02d2 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
@@ -199,7 +199,8 @@ rkisp1_lsc_matrix_config_v10(struct rkisp1_params *params,
const struct rkisp1_cif_isp_lsc_config *pconfig)
{
struct rkisp1_device *rkisp1 = params->rkisp1;
- unsigned int lsc_status, sram_addr, lsc_table_sel, i, j;
+ u32 lsc_status, sram_addr, lsc_table_sel;
+ unsigned int i, j;
lsc_status = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
@@ -258,7 +259,8 @@ rkisp1_lsc_matrix_config_v12(struct rkisp1_params *params,
const struct rkisp1_cif_isp_lsc_config *pconfig)
{
struct rkisp1_device *rkisp1 = params->rkisp1;
- unsigned int lsc_status, sram_addr, lsc_table_sel, i, j;
+ u32 lsc_status, sram_addr, lsc_table_sel;
+ unsigned int i, j;
lsc_status = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
@@ -316,8 +318,8 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
const struct rkisp1_cif_isp_lsc_config *arg)
{
struct rkisp1_device *rkisp1 = params->rkisp1;
- unsigned int i, data;
- u32 lsc_ctrl;
+ u32 lsc_ctrl, data;
+ unsigned int i;
/* To config must be off , store the current status firstly */
lsc_ctrl = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_CTRL);
--
Regards,
Laurent Pinchart
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 2/5] media: rkisp1: Store LSC register values in u32 variables
@ 2022-08-17 2:18 ` Laurent Pinchart
0 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-08-17 2:18 UTC (permalink / raw)
To: linux-media
Cc: Dafna Hirschfeld, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
Use the u32 type instead of unsigned int to store register values in the
LSC configuration code, to make the variables' size more explicit. No
functional change intended.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/media/platform/rockchip/rkisp1/rkisp1-params.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
index fbbaf5505291..dbe826fd02d2 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
@@ -199,7 +199,8 @@ rkisp1_lsc_matrix_config_v10(struct rkisp1_params *params,
const struct rkisp1_cif_isp_lsc_config *pconfig)
{
struct rkisp1_device *rkisp1 = params->rkisp1;
- unsigned int lsc_status, sram_addr, lsc_table_sel, i, j;
+ u32 lsc_status, sram_addr, lsc_table_sel;
+ unsigned int i, j;
lsc_status = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
@@ -258,7 +259,8 @@ rkisp1_lsc_matrix_config_v12(struct rkisp1_params *params,
const struct rkisp1_cif_isp_lsc_config *pconfig)
{
struct rkisp1_device *rkisp1 = params->rkisp1;
- unsigned int lsc_status, sram_addr, lsc_table_sel, i, j;
+ u32 lsc_status, sram_addr, lsc_table_sel;
+ unsigned int i, j;
lsc_status = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
@@ -316,8 +318,8 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
const struct rkisp1_cif_isp_lsc_config *arg)
{
struct rkisp1_device *rkisp1 = params->rkisp1;
- unsigned int i, data;
- u32 lsc_ctrl;
+ u32 lsc_ctrl, data;
+ unsigned int i;
/* To config must be off , store the current status firstly */
lsc_ctrl = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_CTRL);
--
Regards,
Laurent Pinchart
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 3/5] media: rkisp1: Simplify LSC x/y size and grad register macros
2022-08-17 2:18 ` Laurent Pinchart
@ 2022-08-17 2:18 ` Laurent Pinchart
-1 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-08-17 2:18 UTC (permalink / raw)
To: linux-media
Cc: Dafna Hirschfeld, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
The LSC module x/y size and grad configuration is stored in a set of 4
indexed registers each. The rkisp1-regs.h header defines all those
registers, but only the first one in each set is used, with manual
calculation of addresses of subsequent registers. Simplifies this by
merging all 4 register macros into one that takes the index as a
parameter. No functional change intended.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
.../platform/rockchip/rkisp1/rkisp1-params.c | 8 ++++----
.../platform/rockchip/rkisp1/rkisp1-regs.h | 20 ++++---------------
2 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
index dbe826fd02d2..aa6efa4c6e9e 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
@@ -331,22 +331,22 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
/* program x size tables */
data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_size_tbl[i * 2],
arg->x_size_tbl[i * 2 + 1]);
- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE_01 + i * 4, data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE(i), data);
/* program x grad tables */
data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2],
arg->x_grad_tbl[i * 2 + 1]);
- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD_01 + i * 4, data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD(i), data);
/* program y size tables */
data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_size_tbl[i * 2],
arg->y_size_tbl[i * 2 + 1]);
- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE_01 + i * 4, data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE(i), data);
/* program y grad tables */
data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2],
arg->y_grad_tbl[i * 2 + 1]);
- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD_01 + i * 4, data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD(i), data);
}
/* restore the lsc ctrl status */
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
index 044af3d6e4f3..2ad24deedec8 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
@@ -1162,22 +1162,10 @@
#define RKISP1_CIF_ISP_LSC_GR_TABLE_DATA (RKISP1_CIF_ISP_LSC_BASE + 0x00000018)
#define RKISP1_CIF_ISP_LSC_B_TABLE_DATA (RKISP1_CIF_ISP_LSC_BASE + 0x0000001C)
#define RKISP1_CIF_ISP_LSC_GB_TABLE_DATA (RKISP1_CIF_ISP_LSC_BASE + 0x00000020)
-#define RKISP1_CIF_ISP_LSC_XGRAD_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000024)
-#define RKISP1_CIF_ISP_LSC_XGRAD_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000028)
-#define RKISP1_CIF_ISP_LSC_XGRAD_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000002C)
-#define RKISP1_CIF_ISP_LSC_XGRAD_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000030)
-#define RKISP1_CIF_ISP_LSC_YGRAD_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000034)
-#define RKISP1_CIF_ISP_LSC_YGRAD_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000038)
-#define RKISP1_CIF_ISP_LSC_YGRAD_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000003C)
-#define RKISP1_CIF_ISP_LSC_YGRAD_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000040)
-#define RKISP1_CIF_ISP_LSC_XSIZE_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000044)
-#define RKISP1_CIF_ISP_LSC_XSIZE_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000048)
-#define RKISP1_CIF_ISP_LSC_XSIZE_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000004C)
-#define RKISP1_CIF_ISP_LSC_XSIZE_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000050)
-#define RKISP1_CIF_ISP_LSC_YSIZE_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000054)
-#define RKISP1_CIF_ISP_LSC_YSIZE_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000058)
-#define RKISP1_CIF_ISP_LSC_YSIZE_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000005C)
-#define RKISP1_CIF_ISP_LSC_YSIZE_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000060)
+#define RKISP1_CIF_ISP_LSC_XGRAD(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000024 + (n) * 4)
+#define RKISP1_CIF_ISP_LSC_YGRAD(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000034 + (n) * 4)
+#define RKISP1_CIF_ISP_LSC_XSIZE(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000044 + (n) * 4)
+#define RKISP1_CIF_ISP_LSC_YSIZE(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000054 + (n) * 4)
#define RKISP1_CIF_ISP_LSC_TABLE_SEL (RKISP1_CIF_ISP_LSC_BASE + 0x00000064)
#define RKISP1_CIF_ISP_LSC_STATUS (RKISP1_CIF_ISP_LSC_BASE + 0x00000068)
--
Regards,
Laurent Pinchart
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 3/5] media: rkisp1: Simplify LSC x/y size and grad register macros
@ 2022-08-17 2:18 ` Laurent Pinchart
0 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-08-17 2:18 UTC (permalink / raw)
To: linux-media
Cc: Dafna Hirschfeld, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
The LSC module x/y size and grad configuration is stored in a set of 4
indexed registers each. The rkisp1-regs.h header defines all those
registers, but only the first one in each set is used, with manual
calculation of addresses of subsequent registers. Simplifies this by
merging all 4 register macros into one that takes the index as a
parameter. No functional change intended.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
.../platform/rockchip/rkisp1/rkisp1-params.c | 8 ++++----
.../platform/rockchip/rkisp1/rkisp1-regs.h | 20 ++++---------------
2 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
index dbe826fd02d2..aa6efa4c6e9e 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
@@ -331,22 +331,22 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
/* program x size tables */
data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_size_tbl[i * 2],
arg->x_size_tbl[i * 2 + 1]);
- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE_01 + i * 4, data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE(i), data);
/* program x grad tables */
data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2],
arg->x_grad_tbl[i * 2 + 1]);
- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD_01 + i * 4, data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD(i), data);
/* program y size tables */
data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_size_tbl[i * 2],
arg->y_size_tbl[i * 2 + 1]);
- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE_01 + i * 4, data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE(i), data);
/* program y grad tables */
data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2],
arg->y_grad_tbl[i * 2 + 1]);
- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD_01 + i * 4, data);
+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD(i), data);
}
/* restore the lsc ctrl status */
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
index 044af3d6e4f3..2ad24deedec8 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
@@ -1162,22 +1162,10 @@
#define RKISP1_CIF_ISP_LSC_GR_TABLE_DATA (RKISP1_CIF_ISP_LSC_BASE + 0x00000018)
#define RKISP1_CIF_ISP_LSC_B_TABLE_DATA (RKISP1_CIF_ISP_LSC_BASE + 0x0000001C)
#define RKISP1_CIF_ISP_LSC_GB_TABLE_DATA (RKISP1_CIF_ISP_LSC_BASE + 0x00000020)
-#define RKISP1_CIF_ISP_LSC_XGRAD_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000024)
-#define RKISP1_CIF_ISP_LSC_XGRAD_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000028)
-#define RKISP1_CIF_ISP_LSC_XGRAD_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000002C)
-#define RKISP1_CIF_ISP_LSC_XGRAD_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000030)
-#define RKISP1_CIF_ISP_LSC_YGRAD_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000034)
-#define RKISP1_CIF_ISP_LSC_YGRAD_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000038)
-#define RKISP1_CIF_ISP_LSC_YGRAD_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000003C)
-#define RKISP1_CIF_ISP_LSC_YGRAD_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000040)
-#define RKISP1_CIF_ISP_LSC_XSIZE_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000044)
-#define RKISP1_CIF_ISP_LSC_XSIZE_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000048)
-#define RKISP1_CIF_ISP_LSC_XSIZE_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000004C)
-#define RKISP1_CIF_ISP_LSC_XSIZE_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000050)
-#define RKISP1_CIF_ISP_LSC_YSIZE_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000054)
-#define RKISP1_CIF_ISP_LSC_YSIZE_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000058)
-#define RKISP1_CIF_ISP_LSC_YSIZE_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000005C)
-#define RKISP1_CIF_ISP_LSC_YSIZE_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000060)
+#define RKISP1_CIF_ISP_LSC_XGRAD(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000024 + (n) * 4)
+#define RKISP1_CIF_ISP_LSC_YGRAD(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000034 + (n) * 4)
+#define RKISP1_CIF_ISP_LSC_XSIZE(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000044 + (n) * 4)
+#define RKISP1_CIF_ISP_LSC_YSIZE(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000054 + (n) * 4)
#define RKISP1_CIF_ISP_LSC_TABLE_SEL (RKISP1_CIF_ISP_LSC_BASE + 0x00000064)
#define RKISP1_CIF_ISP_LSC_STATUS (RKISP1_CIF_ISP_LSC_BASE + 0x00000068)
--
Regards,
Laurent Pinchart
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 4/5] media: rkisp1: Use RKISP1_CIF_ISP_LSC_GRAD_SIZE() for gradient registers
2022-08-17 2:18 ` Laurent Pinchart
@ 2022-08-17 2:18 ` Laurent Pinchart
-1 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-08-17 2:18 UTC (permalink / raw)
To: linux-media
Cc: Dafna Hirschfeld, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
The rkisp1_lsc_config() function incorrectly uses the
RKISP1_CIF_ISP_LSC_SECT_SIZE() macro for the gradient registers. Replace
it with the correct RKISP1_CIF_ISP_LSC_GRAD_SIZE() macro. This doesn't
cause any functional change as the two macros are defined identically
(the size and gradient registers store fields in the same number of bits
at the same positions).
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/media/platform/rockchip/rkisp1/rkisp1-params.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
index aa6efa4c6e9e..421ade177b2d 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
@@ -334,7 +334,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE(i), data);
/* program x grad tables */
- data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2],
+ data = RKISP1_CIF_ISP_LSC_GRAD_SIZE(arg->x_grad_tbl[i * 2],
arg->x_grad_tbl[i * 2 + 1]);
rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD(i), data);
@@ -344,7 +344,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE(i), data);
/* program y grad tables */
- data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2],
+ data = RKISP1_CIF_ISP_LSC_GRAD_SIZE(arg->y_grad_tbl[i * 2],
arg->y_grad_tbl[i * 2 + 1]);
rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD(i), data);
}
--
Regards,
Laurent Pinchart
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 4/5] media: rkisp1: Use RKISP1_CIF_ISP_LSC_GRAD_SIZE() for gradient registers
@ 2022-08-17 2:18 ` Laurent Pinchart
0 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-08-17 2:18 UTC (permalink / raw)
To: linux-media
Cc: Dafna Hirschfeld, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
The rkisp1_lsc_config() function incorrectly uses the
RKISP1_CIF_ISP_LSC_SECT_SIZE() macro for the gradient registers. Replace
it with the correct RKISP1_CIF_ISP_LSC_GRAD_SIZE() macro. This doesn't
cause any functional change as the two macros are defined identically
(the size and gradient registers store fields in the same number of bits
at the same positions).
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/media/platform/rockchip/rkisp1/rkisp1-params.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
index aa6efa4c6e9e..421ade177b2d 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
@@ -334,7 +334,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE(i), data);
/* program x grad tables */
- data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2],
+ data = RKISP1_CIF_ISP_LSC_GRAD_SIZE(arg->x_grad_tbl[i * 2],
arg->x_grad_tbl[i * 2 + 1]);
rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD(i), data);
@@ -344,7 +344,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE(i), data);
/* program y grad tables */
- data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2],
+ data = RKISP1_CIF_ISP_LSC_GRAD_SIZE(arg->y_grad_tbl[i * 2],
arg->y_grad_tbl[i * 2 + 1]);
rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD(i), data);
}
--
Regards,
Laurent Pinchart
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 5/5] media: rkisp1: Configure LSC after enabling the ISP
2022-08-17 2:18 ` Laurent Pinchart
@ 2022-08-17 2:18 ` Laurent Pinchart
-1 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-08-17 2:18 UTC (permalink / raw)
To: linux-media
Cc: Dafna Hirschfeld, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
The ISP8000Nano v18.02 (found in the i.MX8MP) requires the ISP to be
enabled (as indicated by the ISP_CTRL.ISP_ENABLE bit) to configure the
lens shading table in internal RAM. The driver currently configures all
ISP initial parameters before enabling the ISP, which causes the LSC RAM
to not be initialized properly.
To fix this, split the rkisp1_params_configure() function into a
rkisp1_params_pre_configure() and a rkisp1_params_post_configure(). The
former configures all ISP parameters but LSC, while the latter
configures LSC. To implement this, the rkisp1_params_apply_params_cfg()
function is deconstructed, with two small helpers created to deal with
the parameters buffers, which are then used in rkisp1_params_isr(),
rkisp1_params_pre_configure() and rkisp1_params_post_configure().
While this initialization ordering is only needed for the ISP8000Nano
v18.02, it doesn't affect other ISP versions negatively, and can thus be
followed unconditionally.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
.../platform/rockchip/rkisp1/rkisp1-common.h | 29 ++-
.../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
.../platform/rockchip/rkisp1/rkisp1-params.c | 169 ++++++++++++------
3 files changed, 143 insertions(+), 64 deletions(-)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
index 1383c13e22b8..f612e1b42b91 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
@@ -589,19 +589,32 @@ void rkisp1_sd_adjust_crop(struct v4l2_rect *crop,
*/
const struct rkisp1_mbus_info *rkisp1_mbus_info_get_by_code(u32 mbus_code);
-/* rkisp1_params_configure - configure the params when stream starts.
- * This function is called by the isp entity upon stream starts.
- * The function applies the initial configuration of the parameters.
+/*
+ * rkisp1_params_pre_configure - Configure the params before stream start
*
- * @params: pointer to rkisp1_params.
+ * @params: pointer to rkisp1_params
* @bayer_pat: the bayer pattern on the isp video sink pad
* @quantization: the quantization configured on the isp's src pad
* @ycbcr_encoding: the ycbcr_encoding configured on the isp's src pad
+ *
+ * This function is called by the ISP entity just before the ISP gets started.
+ * It applies the initial ISP parameters from the first params buffer, but
+ * skips LSC as it needs to be configured after the ISP is started.
*/
-void rkisp1_params_configure(struct rkisp1_params *params,
- enum rkisp1_fmt_raw_pat_type bayer_pat,
- enum v4l2_quantization quantization,
- enum v4l2_ycbcr_encoding ycbcr_encoding);
+void rkisp1_params_pre_configure(struct rkisp1_params *params,
+ enum rkisp1_fmt_raw_pat_type bayer_pat,
+ enum v4l2_quantization quantization,
+ enum v4l2_ycbcr_encoding ycbcr_encoding);
+
+/*
+ * rkisp1_params_post_configure - Configure the params after stream start
+ *
+ * @params: pointer to rkisp1_params
+ *
+ * This function is called by the ISP entity just after the ISP gets started.
+ * It applies the initial ISP KSC parameters from the first params buffer.
+ */
+void rkisp1_params_post_configure(struct rkisp1_params *params);
/* rkisp1_params_disable - disable all parameters.
* This function is called by the isp entity upon stream start
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
index c029d2e86717..4876bf890cb2 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
@@ -343,9 +343,9 @@ static int rkisp1_config_isp(struct rkisp1_isp *isp,
src_frm = rkisp1_isp_get_pad_fmt(isp, NULL,
RKISP1_ISP_PAD_SOURCE_VIDEO,
V4L2_SUBDEV_FORMAT_ACTIVE);
- rkisp1_params_configure(&rkisp1->params, sink_fmt->bayer_pat,
- src_frm->quantization,
- src_frm->ycbcr_enc);
+ rkisp1_params_pre_configure(&rkisp1->params, sink_fmt->bayer_pat,
+ src_frm->quantization,
+ src_frm->ycbcr_enc);
}
return 0;
@@ -462,6 +462,9 @@ static int rkisp1_isp_start(struct rkisp1_isp *isp, struct media_pad *source)
RKISP1_CIF_ISP_CTRL_ISP_INFORM_ENABLE;
rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
+ if (isp->src_fmt->pixel_enc == V4L2_PIXEL_ENC_BAYER)
+ rkisp1_params_post_configure(&rkisp1->params);
+
return 0;
}
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
index 421ade177b2d..a4664efdfea8 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
@@ -1297,22 +1297,6 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
RKISP1_CIF_ISP_CTRL_ISP_GAMMA_IN_ENA);
}
- /* update lsc config */
- if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
- rkisp1_lsc_config(params,
- &new_params->others.lsc_config);
-
- if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
- if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
- rkisp1_param_set_bits(params,
- RKISP1_CIF_ISP_LSC_CTRL,
- RKISP1_CIF_ISP_LSC_CTRL_ENA);
- else
- rkisp1_param_clear_bits(params,
- RKISP1_CIF_ISP_LSC_CTRL,
- RKISP1_CIF_ISP_LSC_CTRL_ENA);
- }
-
/* update awb gains */
if (module_cfg_update & RKISP1_CIF_ISP_MODULE_AWB_GAIN)
params->ops->awb_gain_config(params, &new_params->others.awb_gain_config);
@@ -1429,6 +1413,33 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
}
}
+static void
+rkisp1_isp_isr_lsc_config(struct rkisp1_params *params,
+ const struct rkisp1_params_cfg *new_params)
+{
+ unsigned int module_en_update, module_cfg_update, module_ens;
+
+ module_en_update = new_params->module_en_update;
+ module_cfg_update = new_params->module_cfg_update;
+ module_ens = new_params->module_ens;
+
+ /* update lsc config */
+ if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
+ rkisp1_lsc_config(params,
+ &new_params->others.lsc_config);
+
+ if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
+ if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
+ rkisp1_param_set_bits(params,
+ RKISP1_CIF_ISP_LSC_CTRL,
+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
+ else
+ rkisp1_param_clear_bits(params,
+ RKISP1_CIF_ISP_LSC_CTRL,
+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
+ }
+}
+
static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
struct rkisp1_params_cfg *new_params)
{
@@ -1490,47 +1501,60 @@ static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
}
}
-static void rkisp1_params_apply_params_cfg(struct rkisp1_params *params,
- unsigned int frame_sequence)
+static bool rkisp1_params_get_buffer(struct rkisp1_params *params,
+ struct rkisp1_buffer **buf,
+ struct rkisp1_params_cfg **cfg)
{
- struct rkisp1_params_cfg *new_params;
- struct rkisp1_buffer *cur_buf = NULL;
-
if (list_empty(¶ms->params))
- return;
+ return false;
- cur_buf = list_first_entry(¶ms->params,
- struct rkisp1_buffer, queue);
+ *buf = list_first_entry(¶ms->params, struct rkisp1_buffer, queue);
+ *cfg = vb2_plane_vaddr(&(*buf)->vb.vb2_buf, 0);
- new_params = (struct rkisp1_params_cfg *)vb2_plane_vaddr(&cur_buf->vb.vb2_buf, 0);
+ return true;
+}
- rkisp1_isp_isr_other_config(params, new_params);
- rkisp1_isp_isr_meas_config(params, new_params);
+static void rkisp1_params_complete_buffer(struct rkisp1_params *params,
+ struct rkisp1_buffer *buf,
+ unsigned int frame_sequence)
+{
+ list_del(&buf->queue);
- /* update shadow register immediately */
- rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL, RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
-
- list_del(&cur_buf->queue);
-
- cur_buf->vb.sequence = frame_sequence;
- vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
+ buf->vb.sequence = frame_sequence;
+ vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
}
void rkisp1_params_isr(struct rkisp1_device *rkisp1)
{
- /*
- * This isr is called when the ISR finishes processing a frame (RKISP1_CIF_ISP_FRAME).
- * Configurations performed here will be applied on the next frame.
- * Since frame_sequence is updated on the vertical sync signal, we should use
- * frame_sequence + 1 here to indicate to userspace on which frame these parameters
- * are being applied.
- */
- unsigned int frame_sequence = rkisp1->isp.frame_sequence + 1;
struct rkisp1_params *params = &rkisp1->params;
+ struct rkisp1_params_cfg *new_params;
+ struct rkisp1_buffer *cur_buf;
spin_lock(¶ms->config_lock);
- rkisp1_params_apply_params_cfg(params, frame_sequence);
+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
+ goto unlock;
+
+ rkisp1_isp_isr_other_config(params, new_params);
+ rkisp1_isp_isr_lsc_config(params, new_params);
+ rkisp1_isp_isr_meas_config(params, new_params);
+
+ /* update shadow register immediately */
+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
+
+ /*
+ * This isr is called when the ISR finishes processing a frame
+ * (RKISP1_CIF_ISP_FRAME). Configurations performed here will be
+ * applied on the next frame. Since frame_sequence is updated on the
+ * vertical sync signal, we should use frame_sequence + 1 here to
+ * indicate to userspace on which frame these parameters are being
+ * applied.
+ */
+ rkisp1_params_complete_buffer(params, cur_buf,
+ rkisp1->isp.frame_sequence + 1);
+
+unlock:
spin_unlock(¶ms->config_lock);
}
@@ -1573,9 +1597,18 @@ static const struct rkisp1_cif_isp_afc_config rkisp1_afc_params_default_config =
14
};
-static void rkisp1_params_config_parameter(struct rkisp1_params *params)
+void rkisp1_params_pre_configure(struct rkisp1_params *params,
+ enum rkisp1_fmt_raw_pat_type bayer_pat,
+ enum v4l2_quantization quantization,
+ enum v4l2_ycbcr_encoding ycbcr_encoding)
{
struct rkisp1_cif_isp_hst_config hst = rkisp1_hst_params_default_config;
+ struct rkisp1_params_cfg *new_params;
+ struct rkisp1_buffer *cur_buf;
+
+ params->quantization = quantization;
+ params->ycbcr_encoding = ycbcr_encoding;
+ params->raw_type = bayer_pat;
params->ops->awb_meas_config(params, &rkisp1_awb_params_default_config);
params->ops->awb_meas_enable(params, &rkisp1_awb_params_default_config,
@@ -1599,20 +1632,50 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params)
spin_lock_irq(¶ms->config_lock);
/* apply the first buffer if there is one already */
- rkisp1_params_apply_params_cfg(params, 0);
+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
+ goto unlock;
+
+ rkisp1_isp_isr_other_config(params, new_params);
+ rkisp1_isp_isr_meas_config(params, new_params);
+
+ /* update shadow register immediately */
+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
+
+unlock:
spin_unlock_irq(¶ms->config_lock);
}
-void rkisp1_params_configure(struct rkisp1_params *params,
- enum rkisp1_fmt_raw_pat_type bayer_pat,
- enum v4l2_quantization quantization,
- enum v4l2_ycbcr_encoding ycbcr_encoding)
+void rkisp1_params_post_configure(struct rkisp1_params *params)
{
- params->quantization = quantization;
- params->ycbcr_encoding = ycbcr_encoding;
- params->raw_type = bayer_pat;
- rkisp1_params_config_parameter(params);
+ struct rkisp1_params_cfg *new_params;
+ struct rkisp1_buffer *cur_buf;
+
+ spin_lock_irq(¶ms->config_lock);
+
+ /*
+ * Apply LSC parameters from the first buffer (if any is already
+ * available. This must be done after the ISP gets started in the
+ * ISP8000Nano v18.02 (found in the i.MX8MP) as access to the LSC RAM
+ * is gated by the ISP_CTRL.ISP_ENABLE bit. As this initialization
+ * ordering doesn't affect other ISP versions negatively, do so
+ * unconditionally.
+ */
+
+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
+ goto unlock;
+
+ rkisp1_isp_isr_lsc_config(params, new_params);
+
+ /* update shadow register immediately */
+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
+
+ rkisp1_params_complete_buffer(params, cur_buf, 0);
+
+unlock:
+ spin_unlock_irq(¶ms->config_lock);
}
/*
--
Regards,
Laurent Pinchart
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH 5/5] media: rkisp1: Configure LSC after enabling the ISP
@ 2022-08-17 2:18 ` Laurent Pinchart
0 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-08-17 2:18 UTC (permalink / raw)
To: linux-media
Cc: Dafna Hirschfeld, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
The ISP8000Nano v18.02 (found in the i.MX8MP) requires the ISP to be
enabled (as indicated by the ISP_CTRL.ISP_ENABLE bit) to configure the
lens shading table in internal RAM. The driver currently configures all
ISP initial parameters before enabling the ISP, which causes the LSC RAM
to not be initialized properly.
To fix this, split the rkisp1_params_configure() function into a
rkisp1_params_pre_configure() and a rkisp1_params_post_configure(). The
former configures all ISP parameters but LSC, while the latter
configures LSC. To implement this, the rkisp1_params_apply_params_cfg()
function is deconstructed, with two small helpers created to deal with
the parameters buffers, which are then used in rkisp1_params_isr(),
rkisp1_params_pre_configure() and rkisp1_params_post_configure().
While this initialization ordering is only needed for the ISP8000Nano
v18.02, it doesn't affect other ISP versions negatively, and can thus be
followed unconditionally.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
.../platform/rockchip/rkisp1/rkisp1-common.h | 29 ++-
.../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
.../platform/rockchip/rkisp1/rkisp1-params.c | 169 ++++++++++++------
3 files changed, 143 insertions(+), 64 deletions(-)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
index 1383c13e22b8..f612e1b42b91 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
@@ -589,19 +589,32 @@ void rkisp1_sd_adjust_crop(struct v4l2_rect *crop,
*/
const struct rkisp1_mbus_info *rkisp1_mbus_info_get_by_code(u32 mbus_code);
-/* rkisp1_params_configure - configure the params when stream starts.
- * This function is called by the isp entity upon stream starts.
- * The function applies the initial configuration of the parameters.
+/*
+ * rkisp1_params_pre_configure - Configure the params before stream start
*
- * @params: pointer to rkisp1_params.
+ * @params: pointer to rkisp1_params
* @bayer_pat: the bayer pattern on the isp video sink pad
* @quantization: the quantization configured on the isp's src pad
* @ycbcr_encoding: the ycbcr_encoding configured on the isp's src pad
+ *
+ * This function is called by the ISP entity just before the ISP gets started.
+ * It applies the initial ISP parameters from the first params buffer, but
+ * skips LSC as it needs to be configured after the ISP is started.
*/
-void rkisp1_params_configure(struct rkisp1_params *params,
- enum rkisp1_fmt_raw_pat_type bayer_pat,
- enum v4l2_quantization quantization,
- enum v4l2_ycbcr_encoding ycbcr_encoding);
+void rkisp1_params_pre_configure(struct rkisp1_params *params,
+ enum rkisp1_fmt_raw_pat_type bayer_pat,
+ enum v4l2_quantization quantization,
+ enum v4l2_ycbcr_encoding ycbcr_encoding);
+
+/*
+ * rkisp1_params_post_configure - Configure the params after stream start
+ *
+ * @params: pointer to rkisp1_params
+ *
+ * This function is called by the ISP entity just after the ISP gets started.
+ * It applies the initial ISP KSC parameters from the first params buffer.
+ */
+void rkisp1_params_post_configure(struct rkisp1_params *params);
/* rkisp1_params_disable - disable all parameters.
* This function is called by the isp entity upon stream start
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
index c029d2e86717..4876bf890cb2 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
@@ -343,9 +343,9 @@ static int rkisp1_config_isp(struct rkisp1_isp *isp,
src_frm = rkisp1_isp_get_pad_fmt(isp, NULL,
RKISP1_ISP_PAD_SOURCE_VIDEO,
V4L2_SUBDEV_FORMAT_ACTIVE);
- rkisp1_params_configure(&rkisp1->params, sink_fmt->bayer_pat,
- src_frm->quantization,
- src_frm->ycbcr_enc);
+ rkisp1_params_pre_configure(&rkisp1->params, sink_fmt->bayer_pat,
+ src_frm->quantization,
+ src_frm->ycbcr_enc);
}
return 0;
@@ -462,6 +462,9 @@ static int rkisp1_isp_start(struct rkisp1_isp *isp, struct media_pad *source)
RKISP1_CIF_ISP_CTRL_ISP_INFORM_ENABLE;
rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
+ if (isp->src_fmt->pixel_enc == V4L2_PIXEL_ENC_BAYER)
+ rkisp1_params_post_configure(&rkisp1->params);
+
return 0;
}
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
index 421ade177b2d..a4664efdfea8 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
@@ -1297,22 +1297,6 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
RKISP1_CIF_ISP_CTRL_ISP_GAMMA_IN_ENA);
}
- /* update lsc config */
- if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
- rkisp1_lsc_config(params,
- &new_params->others.lsc_config);
-
- if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
- if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
- rkisp1_param_set_bits(params,
- RKISP1_CIF_ISP_LSC_CTRL,
- RKISP1_CIF_ISP_LSC_CTRL_ENA);
- else
- rkisp1_param_clear_bits(params,
- RKISP1_CIF_ISP_LSC_CTRL,
- RKISP1_CIF_ISP_LSC_CTRL_ENA);
- }
-
/* update awb gains */
if (module_cfg_update & RKISP1_CIF_ISP_MODULE_AWB_GAIN)
params->ops->awb_gain_config(params, &new_params->others.awb_gain_config);
@@ -1429,6 +1413,33 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
}
}
+static void
+rkisp1_isp_isr_lsc_config(struct rkisp1_params *params,
+ const struct rkisp1_params_cfg *new_params)
+{
+ unsigned int module_en_update, module_cfg_update, module_ens;
+
+ module_en_update = new_params->module_en_update;
+ module_cfg_update = new_params->module_cfg_update;
+ module_ens = new_params->module_ens;
+
+ /* update lsc config */
+ if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
+ rkisp1_lsc_config(params,
+ &new_params->others.lsc_config);
+
+ if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
+ if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
+ rkisp1_param_set_bits(params,
+ RKISP1_CIF_ISP_LSC_CTRL,
+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
+ else
+ rkisp1_param_clear_bits(params,
+ RKISP1_CIF_ISP_LSC_CTRL,
+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
+ }
+}
+
static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
struct rkisp1_params_cfg *new_params)
{
@@ -1490,47 +1501,60 @@ static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
}
}
-static void rkisp1_params_apply_params_cfg(struct rkisp1_params *params,
- unsigned int frame_sequence)
+static bool rkisp1_params_get_buffer(struct rkisp1_params *params,
+ struct rkisp1_buffer **buf,
+ struct rkisp1_params_cfg **cfg)
{
- struct rkisp1_params_cfg *new_params;
- struct rkisp1_buffer *cur_buf = NULL;
-
if (list_empty(¶ms->params))
- return;
+ return false;
- cur_buf = list_first_entry(¶ms->params,
- struct rkisp1_buffer, queue);
+ *buf = list_first_entry(¶ms->params, struct rkisp1_buffer, queue);
+ *cfg = vb2_plane_vaddr(&(*buf)->vb.vb2_buf, 0);
- new_params = (struct rkisp1_params_cfg *)vb2_plane_vaddr(&cur_buf->vb.vb2_buf, 0);
+ return true;
+}
- rkisp1_isp_isr_other_config(params, new_params);
- rkisp1_isp_isr_meas_config(params, new_params);
+static void rkisp1_params_complete_buffer(struct rkisp1_params *params,
+ struct rkisp1_buffer *buf,
+ unsigned int frame_sequence)
+{
+ list_del(&buf->queue);
- /* update shadow register immediately */
- rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL, RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
-
- list_del(&cur_buf->queue);
-
- cur_buf->vb.sequence = frame_sequence;
- vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
+ buf->vb.sequence = frame_sequence;
+ vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
}
void rkisp1_params_isr(struct rkisp1_device *rkisp1)
{
- /*
- * This isr is called when the ISR finishes processing a frame (RKISP1_CIF_ISP_FRAME).
- * Configurations performed here will be applied on the next frame.
- * Since frame_sequence is updated on the vertical sync signal, we should use
- * frame_sequence + 1 here to indicate to userspace on which frame these parameters
- * are being applied.
- */
- unsigned int frame_sequence = rkisp1->isp.frame_sequence + 1;
struct rkisp1_params *params = &rkisp1->params;
+ struct rkisp1_params_cfg *new_params;
+ struct rkisp1_buffer *cur_buf;
spin_lock(¶ms->config_lock);
- rkisp1_params_apply_params_cfg(params, frame_sequence);
+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
+ goto unlock;
+
+ rkisp1_isp_isr_other_config(params, new_params);
+ rkisp1_isp_isr_lsc_config(params, new_params);
+ rkisp1_isp_isr_meas_config(params, new_params);
+
+ /* update shadow register immediately */
+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
+
+ /*
+ * This isr is called when the ISR finishes processing a frame
+ * (RKISP1_CIF_ISP_FRAME). Configurations performed here will be
+ * applied on the next frame. Since frame_sequence is updated on the
+ * vertical sync signal, we should use frame_sequence + 1 here to
+ * indicate to userspace on which frame these parameters are being
+ * applied.
+ */
+ rkisp1_params_complete_buffer(params, cur_buf,
+ rkisp1->isp.frame_sequence + 1);
+
+unlock:
spin_unlock(¶ms->config_lock);
}
@@ -1573,9 +1597,18 @@ static const struct rkisp1_cif_isp_afc_config rkisp1_afc_params_default_config =
14
};
-static void rkisp1_params_config_parameter(struct rkisp1_params *params)
+void rkisp1_params_pre_configure(struct rkisp1_params *params,
+ enum rkisp1_fmt_raw_pat_type bayer_pat,
+ enum v4l2_quantization quantization,
+ enum v4l2_ycbcr_encoding ycbcr_encoding)
{
struct rkisp1_cif_isp_hst_config hst = rkisp1_hst_params_default_config;
+ struct rkisp1_params_cfg *new_params;
+ struct rkisp1_buffer *cur_buf;
+
+ params->quantization = quantization;
+ params->ycbcr_encoding = ycbcr_encoding;
+ params->raw_type = bayer_pat;
params->ops->awb_meas_config(params, &rkisp1_awb_params_default_config);
params->ops->awb_meas_enable(params, &rkisp1_awb_params_default_config,
@@ -1599,20 +1632,50 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params)
spin_lock_irq(¶ms->config_lock);
/* apply the first buffer if there is one already */
- rkisp1_params_apply_params_cfg(params, 0);
+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
+ goto unlock;
+
+ rkisp1_isp_isr_other_config(params, new_params);
+ rkisp1_isp_isr_meas_config(params, new_params);
+
+ /* update shadow register immediately */
+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
+
+unlock:
spin_unlock_irq(¶ms->config_lock);
}
-void rkisp1_params_configure(struct rkisp1_params *params,
- enum rkisp1_fmt_raw_pat_type bayer_pat,
- enum v4l2_quantization quantization,
- enum v4l2_ycbcr_encoding ycbcr_encoding)
+void rkisp1_params_post_configure(struct rkisp1_params *params)
{
- params->quantization = quantization;
- params->ycbcr_encoding = ycbcr_encoding;
- params->raw_type = bayer_pat;
- rkisp1_params_config_parameter(params);
+ struct rkisp1_params_cfg *new_params;
+ struct rkisp1_buffer *cur_buf;
+
+ spin_lock_irq(¶ms->config_lock);
+
+ /*
+ * Apply LSC parameters from the first buffer (if any is already
+ * available. This must be done after the ISP gets started in the
+ * ISP8000Nano v18.02 (found in the i.MX8MP) as access to the LSC RAM
+ * is gated by the ISP_CTRL.ISP_ENABLE bit. As this initialization
+ * ordering doesn't affect other ISP versions negatively, do so
+ * unconditionally.
+ */
+
+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
+ goto unlock;
+
+ rkisp1_isp_isr_lsc_config(params, new_params);
+
+ /* update shadow register immediately */
+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
+
+ rkisp1_params_complete_buffer(params, cur_buf, 0);
+
+unlock:
+ spin_unlock_irq(¶ms->config_lock);
}
/*
--
Regards,
Laurent Pinchart
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 46+ messages in thread
* Re: [PATCH 1/5] media: rkisp1: Clean up LSC configuration code
2022-08-17 2:18 ` Laurent Pinchart
@ 2022-08-18 2:32 ` Dafna Hirschfeld
-1 siblings, 0 replies; 46+ messages in thread
From: Dafna Hirschfeld @ 2022-08-18 2:32 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
On 17.08.2022 05:18, Laurent Pinchart wrote:
>Clean up the LSC configuration code to improve its readability by
>shortening lines, using extra local variables and renaming long
>variables. No functional change intended.
>
>Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Dafna Hirschfeld <dafna@fastmail.com>
>---
> .../platform/rockchip/rkisp1/rkisp1-params.c | 199 ++++++++----------
> 1 file changed, 86 insertions(+), 113 deletions(-)
>
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>index 246a6faa1fc1..fbbaf5505291 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>@@ -198,149 +198,129 @@ static void
> rkisp1_lsc_matrix_config_v10(struct rkisp1_params *params,
> const struct rkisp1_cif_isp_lsc_config *pconfig)
> {
>- unsigned int isp_lsc_status, sram_addr, isp_lsc_table_sel, i, j, data;
>+ struct rkisp1_device *rkisp1 = params->rkisp1;
>+ unsigned int lsc_status, sram_addr, lsc_table_sel, i, j;
>
>- isp_lsc_status = rkisp1_read(params->rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
>+ lsc_status = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
>
> /* RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_153 = ( 17 * 18 ) >> 1 */
>- sram_addr = (isp_lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE) ?
>+ sram_addr = lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE ?
> RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_0 :
> RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_153;
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_ADDR, sram_addr);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_ADDR, sram_addr);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_ADDR, sram_addr);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_ADDR, sram_addr);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_ADDR, sram_addr);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_ADDR, sram_addr);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_ADDR, sram_addr);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_ADDR, sram_addr);
>
> /* program data tables (table size is 9 * 17 = 153) */
> for (i = 0; i < RKISP1_CIF_ISP_LSC_SAMPLES_MAX; i++) {
>+ const __u16 *r_tbl = pconfig->r_data_tbl[i];
>+ const __u16 *gr_tbl = pconfig->gr_data_tbl[i];
>+ const __u16 *gb_tbl = pconfig->gb_data_tbl[i];
>+ const __u16 *b_tbl = pconfig->b_data_tbl[i];
>+
> /*
> * 17 sectors with 2 values in one DWORD = 9
> * DWORDs (2nd value of last DWORD unused)
> */
> for (j = 0; j < RKISP1_CIF_ISP_LSC_SAMPLES_MAX - 1; j += 2) {
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->r_data_tbl[i][j],
>- pconfig->r_data_tbl[i][j + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_R_TABLE_DATA, data);
>-
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->gr_data_tbl[i][j],
>- pconfig->gr_data_tbl[i][j + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_GR_TABLE_DATA, data);
>-
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->gb_data_tbl[i][j],
>- pconfig->gb_data_tbl[i][j + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_GB_TABLE_DATA, data);
>-
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->b_data_tbl[i][j],
>- pconfig->b_data_tbl[i][j + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_B_TABLE_DATA, data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(
>+ r_tbl[j], r_tbl[j + 1]));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(
>+ gr_tbl[j], gr_tbl[j + 1]));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(
>+ gb_tbl[j], gb_tbl[j + 1]));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(
>+ b_tbl[j], b_tbl[j + 1]));
> }
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->r_data_tbl[i][j], 0);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
>- data);
>
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->gr_data_tbl[i][j], 0);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
>- data);
>-
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->gb_data_tbl[i][j], 0);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
>- data);
>-
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->b_data_tbl[i][j], 0);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
>- data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(r_tbl[j], 0));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(gr_tbl[j], 0));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(gb_tbl[j], 0));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(b_tbl[j], 0));
> }
>- isp_lsc_table_sel = (isp_lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE) ?
>- RKISP1_CIF_ISP_LSC_TABLE_0 :
>- RKISP1_CIF_ISP_LSC_TABLE_1;
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_TABLE_SEL,
>- isp_lsc_table_sel);
>+
>+ lsc_table_sel = lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE ?
>+ RKISP1_CIF_ISP_LSC_TABLE_0 : RKISP1_CIF_ISP_LSC_TABLE_1;
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_TABLE_SEL, lsc_table_sel);
> }
>
> static void
> rkisp1_lsc_matrix_config_v12(struct rkisp1_params *params,
> const struct rkisp1_cif_isp_lsc_config *pconfig)
> {
>- unsigned int isp_lsc_status, sram_addr, isp_lsc_table_sel, i, j, data;
>+ struct rkisp1_device *rkisp1 = params->rkisp1;
>+ unsigned int lsc_status, sram_addr, lsc_table_sel, i, j;
>
>- isp_lsc_status = rkisp1_read(params->rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
>+ lsc_status = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
>
> /* RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_153 = ( 17 * 18 ) >> 1 */
>- sram_addr = (isp_lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE) ?
>- RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_0 :
>- RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_153;
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_ADDR, sram_addr);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_ADDR, sram_addr);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_ADDR, sram_addr);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_ADDR, sram_addr);
>+ sram_addr = lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE ?
>+ RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_0 :
>+ RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_153;
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_ADDR, sram_addr);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_ADDR, sram_addr);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_ADDR, sram_addr);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_ADDR, sram_addr);
>
> /* program data tables (table size is 9 * 17 = 153) */
> for (i = 0; i < RKISP1_CIF_ISP_LSC_SAMPLES_MAX; i++) {
>+ const __u16 *r_tbl = pconfig->r_data_tbl[i];
>+ const __u16 *gr_tbl = pconfig->gr_data_tbl[i];
>+ const __u16 *gb_tbl = pconfig->gb_data_tbl[i];
>+ const __u16 *b_tbl = pconfig->b_data_tbl[i];
>+
> /*
> * 17 sectors with 2 values in one DWORD = 9
> * DWORDs (2nd value of last DWORD unused)
> */
> for (j = 0; j < RKISP1_CIF_ISP_LSC_SAMPLES_MAX - 1; j += 2) {
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
>- pconfig->r_data_tbl[i][j],
>- pconfig->r_data_tbl[i][j + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_R_TABLE_DATA, data);
>-
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
>- pconfig->gr_data_tbl[i][j],
>- pconfig->gr_data_tbl[i][j + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_GR_TABLE_DATA, data);
>-
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
>- pconfig->gb_data_tbl[i][j],
>- pconfig->gb_data_tbl[i][j + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_GB_TABLE_DATA, data);
>-
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
>- pconfig->b_data_tbl[i][j],
>- pconfig->b_data_tbl[i][j + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_B_TABLE_DATA, data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
>+ r_tbl[j], r_tbl[j + 1]));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
>+ gr_tbl[j], gr_tbl[j + 1]));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
>+ gb_tbl[j], gb_tbl[j + 1]));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
>+ b_tbl[j], b_tbl[j + 1]));
> }
>
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(pconfig->r_data_tbl[i][j], 0);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
>- data);
>-
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(pconfig->gr_data_tbl[i][j], 0);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
>- data);
>-
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(pconfig->gb_data_tbl[i][j], 0);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
>- data);
>-
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(pconfig->b_data_tbl[i][j], 0);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
>- data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(r_tbl[j], 0));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(gr_tbl[j], 0));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(gb_tbl[j], 0));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(b_tbl[j], 0));
> }
>- isp_lsc_table_sel = (isp_lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE) ?
>- RKISP1_CIF_ISP_LSC_TABLE_0 :
>- RKISP1_CIF_ISP_LSC_TABLE_1;
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_TABLE_SEL,
>- isp_lsc_table_sel);
>+
>+ lsc_table_sel = lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE ?
>+ RKISP1_CIF_ISP_LSC_TABLE_0 : RKISP1_CIF_ISP_LSC_TABLE_1;
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_TABLE_SEL, lsc_table_sel);
> }
>
> static void rkisp1_lsc_config(struct rkisp1_params *params,
> const struct rkisp1_cif_isp_lsc_config *arg)
> {
>+ struct rkisp1_device *rkisp1 = params->rkisp1;
> unsigned int i, data;
> u32 lsc_ctrl;
>
> /* To config must be off , store the current status firstly */
>- lsc_ctrl = rkisp1_read(params->rkisp1, RKISP1_CIF_ISP_LSC_CTRL);
>+ lsc_ctrl = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_CTRL);
> rkisp1_param_clear_bits(params, RKISP1_CIF_ISP_LSC_CTRL,
> RKISP1_CIF_ISP_LSC_CTRL_ENA);
> params->ops->lsc_matrix_config(params, arg);
>@@ -349,38 +329,31 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
> /* program x size tables */
> data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_size_tbl[i * 2],
> arg->x_size_tbl[i * 2 + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_XSIZE_01 + i * 4, data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE_01 + i * 4, data);
>
> /* program x grad tables */
> data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2],
> arg->x_grad_tbl[i * 2 + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_XGRAD_01 + i * 4, data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD_01 + i * 4, data);
>
> /* program y size tables */
> data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_size_tbl[i * 2],
> arg->y_size_tbl[i * 2 + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_YSIZE_01 + i * 4, data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE_01 + i * 4, data);
>
> /* program y grad tables */
> data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2],
> arg->y_grad_tbl[i * 2 + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_YGRAD_01 + i * 4, data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD_01 + i * 4, data);
> }
>
> /* restore the lsc ctrl status */
>- if (lsc_ctrl & RKISP1_CIF_ISP_LSC_CTRL_ENA) {
>- rkisp1_param_set_bits(params,
>- RKISP1_CIF_ISP_LSC_CTRL,
>+ if (lsc_ctrl & RKISP1_CIF_ISP_LSC_CTRL_ENA)
>+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_LSC_CTRL,
> RKISP1_CIF_ISP_LSC_CTRL_ENA);
>- } else {
>- rkisp1_param_clear_bits(params,
>- RKISP1_CIF_ISP_LSC_CTRL,
>+ else
>+ rkisp1_param_clear_bits(params, RKISP1_CIF_ISP_LSC_CTRL,
> RKISP1_CIF_ISP_LSC_CTRL_ENA);
>- }
> }
>
> /* ISP Filtering function */
>--
>Regards,
>
>Laurent Pinchart
>
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 1/5] media: rkisp1: Clean up LSC configuration code
@ 2022-08-18 2:32 ` Dafna Hirschfeld
0 siblings, 0 replies; 46+ messages in thread
From: Dafna Hirschfeld @ 2022-08-18 2:32 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
On 17.08.2022 05:18, Laurent Pinchart wrote:
>Clean up the LSC configuration code to improve its readability by
>shortening lines, using extra local variables and renaming long
>variables. No functional change intended.
>
>Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Dafna Hirschfeld <dafna@fastmail.com>
>---
> .../platform/rockchip/rkisp1/rkisp1-params.c | 199 ++++++++----------
> 1 file changed, 86 insertions(+), 113 deletions(-)
>
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>index 246a6faa1fc1..fbbaf5505291 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>@@ -198,149 +198,129 @@ static void
> rkisp1_lsc_matrix_config_v10(struct rkisp1_params *params,
> const struct rkisp1_cif_isp_lsc_config *pconfig)
> {
>- unsigned int isp_lsc_status, sram_addr, isp_lsc_table_sel, i, j, data;
>+ struct rkisp1_device *rkisp1 = params->rkisp1;
>+ unsigned int lsc_status, sram_addr, lsc_table_sel, i, j;
>
>- isp_lsc_status = rkisp1_read(params->rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
>+ lsc_status = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
>
> /* RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_153 = ( 17 * 18 ) >> 1 */
>- sram_addr = (isp_lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE) ?
>+ sram_addr = lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE ?
> RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_0 :
> RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_153;
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_ADDR, sram_addr);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_ADDR, sram_addr);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_ADDR, sram_addr);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_ADDR, sram_addr);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_ADDR, sram_addr);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_ADDR, sram_addr);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_ADDR, sram_addr);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_ADDR, sram_addr);
>
> /* program data tables (table size is 9 * 17 = 153) */
> for (i = 0; i < RKISP1_CIF_ISP_LSC_SAMPLES_MAX; i++) {
>+ const __u16 *r_tbl = pconfig->r_data_tbl[i];
>+ const __u16 *gr_tbl = pconfig->gr_data_tbl[i];
>+ const __u16 *gb_tbl = pconfig->gb_data_tbl[i];
>+ const __u16 *b_tbl = pconfig->b_data_tbl[i];
>+
> /*
> * 17 sectors with 2 values in one DWORD = 9
> * DWORDs (2nd value of last DWORD unused)
> */
> for (j = 0; j < RKISP1_CIF_ISP_LSC_SAMPLES_MAX - 1; j += 2) {
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->r_data_tbl[i][j],
>- pconfig->r_data_tbl[i][j + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_R_TABLE_DATA, data);
>-
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->gr_data_tbl[i][j],
>- pconfig->gr_data_tbl[i][j + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_GR_TABLE_DATA, data);
>-
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->gb_data_tbl[i][j],
>- pconfig->gb_data_tbl[i][j + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_GB_TABLE_DATA, data);
>-
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->b_data_tbl[i][j],
>- pconfig->b_data_tbl[i][j + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_B_TABLE_DATA, data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(
>+ r_tbl[j], r_tbl[j + 1]));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(
>+ gr_tbl[j], gr_tbl[j + 1]));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(
>+ gb_tbl[j], gb_tbl[j + 1]));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(
>+ b_tbl[j], b_tbl[j + 1]));
> }
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->r_data_tbl[i][j], 0);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
>- data);
>
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->gr_data_tbl[i][j], 0);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
>- data);
>-
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->gb_data_tbl[i][j], 0);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
>- data);
>-
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(pconfig->b_data_tbl[i][j], 0);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
>- data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(r_tbl[j], 0));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(gr_tbl[j], 0));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(gb_tbl[j], 0));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V10(b_tbl[j], 0));
> }
>- isp_lsc_table_sel = (isp_lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE) ?
>- RKISP1_CIF_ISP_LSC_TABLE_0 :
>- RKISP1_CIF_ISP_LSC_TABLE_1;
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_TABLE_SEL,
>- isp_lsc_table_sel);
>+
>+ lsc_table_sel = lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE ?
>+ RKISP1_CIF_ISP_LSC_TABLE_0 : RKISP1_CIF_ISP_LSC_TABLE_1;
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_TABLE_SEL, lsc_table_sel);
> }
>
> static void
> rkisp1_lsc_matrix_config_v12(struct rkisp1_params *params,
> const struct rkisp1_cif_isp_lsc_config *pconfig)
> {
>- unsigned int isp_lsc_status, sram_addr, isp_lsc_table_sel, i, j, data;
>+ struct rkisp1_device *rkisp1 = params->rkisp1;
>+ unsigned int lsc_status, sram_addr, lsc_table_sel, i, j;
>
>- isp_lsc_status = rkisp1_read(params->rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
>+ lsc_status = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
>
> /* RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_153 = ( 17 * 18 ) >> 1 */
>- sram_addr = (isp_lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE) ?
>- RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_0 :
>- RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_153;
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_ADDR, sram_addr);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_ADDR, sram_addr);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_ADDR, sram_addr);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_ADDR, sram_addr);
>+ sram_addr = lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE ?
>+ RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_0 :
>+ RKISP1_CIF_ISP_LSC_TABLE_ADDRESS_153;
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_ADDR, sram_addr);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_ADDR, sram_addr);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_ADDR, sram_addr);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_ADDR, sram_addr);
>
> /* program data tables (table size is 9 * 17 = 153) */
> for (i = 0; i < RKISP1_CIF_ISP_LSC_SAMPLES_MAX; i++) {
>+ const __u16 *r_tbl = pconfig->r_data_tbl[i];
>+ const __u16 *gr_tbl = pconfig->gr_data_tbl[i];
>+ const __u16 *gb_tbl = pconfig->gb_data_tbl[i];
>+ const __u16 *b_tbl = pconfig->b_data_tbl[i];
>+
> /*
> * 17 sectors with 2 values in one DWORD = 9
> * DWORDs (2nd value of last DWORD unused)
> */
> for (j = 0; j < RKISP1_CIF_ISP_LSC_SAMPLES_MAX - 1; j += 2) {
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
>- pconfig->r_data_tbl[i][j],
>- pconfig->r_data_tbl[i][j + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_R_TABLE_DATA, data);
>-
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
>- pconfig->gr_data_tbl[i][j],
>- pconfig->gr_data_tbl[i][j + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_GR_TABLE_DATA, data);
>-
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
>- pconfig->gb_data_tbl[i][j],
>- pconfig->gb_data_tbl[i][j + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_GB_TABLE_DATA, data);
>-
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
>- pconfig->b_data_tbl[i][j],
>- pconfig->b_data_tbl[i][j + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_B_TABLE_DATA, data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
>+ r_tbl[j], r_tbl[j + 1]));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
>+ gr_tbl[j], gr_tbl[j + 1]));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
>+ gb_tbl[j], gb_tbl[j + 1]));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(
>+ b_tbl[j], b_tbl[j + 1]));
> }
>
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(pconfig->r_data_tbl[i][j], 0);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
>- data);
>-
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(pconfig->gr_data_tbl[i][j], 0);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
>- data);
>-
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(pconfig->gb_data_tbl[i][j], 0);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
>- data);
>-
>- data = RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(pconfig->b_data_tbl[i][j], 0);
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
>- data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_R_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(r_tbl[j], 0));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GR_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(gr_tbl[j], 0));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_GB_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(gb_tbl[j], 0));
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_B_TABLE_DATA,
>+ RKISP1_CIF_ISP_LSC_TABLE_DATA_V12(b_tbl[j], 0));
> }
>- isp_lsc_table_sel = (isp_lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE) ?
>- RKISP1_CIF_ISP_LSC_TABLE_0 :
>- RKISP1_CIF_ISP_LSC_TABLE_1;
>- rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_LSC_TABLE_SEL,
>- isp_lsc_table_sel);
>+
>+ lsc_table_sel = lsc_status & RKISP1_CIF_ISP_LSC_ACTIVE_TABLE ?
>+ RKISP1_CIF_ISP_LSC_TABLE_0 : RKISP1_CIF_ISP_LSC_TABLE_1;
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_TABLE_SEL, lsc_table_sel);
> }
>
> static void rkisp1_lsc_config(struct rkisp1_params *params,
> const struct rkisp1_cif_isp_lsc_config *arg)
> {
>+ struct rkisp1_device *rkisp1 = params->rkisp1;
> unsigned int i, data;
> u32 lsc_ctrl;
>
> /* To config must be off , store the current status firstly */
>- lsc_ctrl = rkisp1_read(params->rkisp1, RKISP1_CIF_ISP_LSC_CTRL);
>+ lsc_ctrl = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_CTRL);
> rkisp1_param_clear_bits(params, RKISP1_CIF_ISP_LSC_CTRL,
> RKISP1_CIF_ISP_LSC_CTRL_ENA);
> params->ops->lsc_matrix_config(params, arg);
>@@ -349,38 +329,31 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
> /* program x size tables */
> data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_size_tbl[i * 2],
> arg->x_size_tbl[i * 2 + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_XSIZE_01 + i * 4, data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE_01 + i * 4, data);
>
> /* program x grad tables */
> data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2],
> arg->x_grad_tbl[i * 2 + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_XGRAD_01 + i * 4, data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD_01 + i * 4, data);
>
> /* program y size tables */
> data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_size_tbl[i * 2],
> arg->y_size_tbl[i * 2 + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_YSIZE_01 + i * 4, data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE_01 + i * 4, data);
>
> /* program y grad tables */
> data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2],
> arg->y_grad_tbl[i * 2 + 1]);
>- rkisp1_write(params->rkisp1,
>- RKISP1_CIF_ISP_LSC_YGRAD_01 + i * 4, data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD_01 + i * 4, data);
> }
>
> /* restore the lsc ctrl status */
>- if (lsc_ctrl & RKISP1_CIF_ISP_LSC_CTRL_ENA) {
>- rkisp1_param_set_bits(params,
>- RKISP1_CIF_ISP_LSC_CTRL,
>+ if (lsc_ctrl & RKISP1_CIF_ISP_LSC_CTRL_ENA)
>+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_LSC_CTRL,
> RKISP1_CIF_ISP_LSC_CTRL_ENA);
>- } else {
>- rkisp1_param_clear_bits(params,
>- RKISP1_CIF_ISP_LSC_CTRL,
>+ else
>+ rkisp1_param_clear_bits(params, RKISP1_CIF_ISP_LSC_CTRL,
> RKISP1_CIF_ISP_LSC_CTRL_ENA);
>- }
> }
>
> /* ISP Filtering function */
>--
>Regards,
>
>Laurent Pinchart
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 2/5] media: rkisp1: Store LSC register values in u32 variables
2022-08-17 2:18 ` Laurent Pinchart
@ 2022-08-18 2:37 ` Dafna Hirschfeld
-1 siblings, 0 replies; 46+ messages in thread
From: Dafna Hirschfeld @ 2022-08-18 2:37 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
On 17.08.2022 05:18, Laurent Pinchart wrote:
>Use the u32 type instead of unsigned int to store register values in the
>LSC configuration code, to make the variables' size more explicit. No
>functional change intended.
>
>Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Dafna Hirschfeld <dafna@fastmail.com>
>---
> drivers/media/platform/rockchip/rkisp1/rkisp1-params.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>index fbbaf5505291..dbe826fd02d2 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>@@ -199,7 +199,8 @@ rkisp1_lsc_matrix_config_v10(struct rkisp1_params *params,
> const struct rkisp1_cif_isp_lsc_config *pconfig)
> {
> struct rkisp1_device *rkisp1 = params->rkisp1;
>- unsigned int lsc_status, sram_addr, lsc_table_sel, i, j;
>+ u32 lsc_status, sram_addr, lsc_table_sel;
>+ unsigned int i, j;
>
> lsc_status = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
>
>@@ -258,7 +259,8 @@ rkisp1_lsc_matrix_config_v12(struct rkisp1_params *params,
> const struct rkisp1_cif_isp_lsc_config *pconfig)
> {
> struct rkisp1_device *rkisp1 = params->rkisp1;
>- unsigned int lsc_status, sram_addr, lsc_table_sel, i, j;
>+ u32 lsc_status, sram_addr, lsc_table_sel;
>+ unsigned int i, j;
>
> lsc_status = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
>
>@@ -316,8 +318,8 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
> const struct rkisp1_cif_isp_lsc_config *arg)
> {
> struct rkisp1_device *rkisp1 = params->rkisp1;
>- unsigned int i, data;
>- u32 lsc_ctrl;
>+ u32 lsc_ctrl, data;
>+ unsigned int i;
>
> /* To config must be off , store the current status firstly */
> lsc_ctrl = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_CTRL);
>--
>Regards,
>
>Laurent Pinchart
>
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 2/5] media: rkisp1: Store LSC register values in u32 variables
@ 2022-08-18 2:37 ` Dafna Hirschfeld
0 siblings, 0 replies; 46+ messages in thread
From: Dafna Hirschfeld @ 2022-08-18 2:37 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
On 17.08.2022 05:18, Laurent Pinchart wrote:
>Use the u32 type instead of unsigned int to store register values in the
>LSC configuration code, to make the variables' size more explicit. No
>functional change intended.
>
>Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Dafna Hirschfeld <dafna@fastmail.com>
>---
> drivers/media/platform/rockchip/rkisp1/rkisp1-params.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>index fbbaf5505291..dbe826fd02d2 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>@@ -199,7 +199,8 @@ rkisp1_lsc_matrix_config_v10(struct rkisp1_params *params,
> const struct rkisp1_cif_isp_lsc_config *pconfig)
> {
> struct rkisp1_device *rkisp1 = params->rkisp1;
>- unsigned int lsc_status, sram_addr, lsc_table_sel, i, j;
>+ u32 lsc_status, sram_addr, lsc_table_sel;
>+ unsigned int i, j;
>
> lsc_status = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
>
>@@ -258,7 +259,8 @@ rkisp1_lsc_matrix_config_v12(struct rkisp1_params *params,
> const struct rkisp1_cif_isp_lsc_config *pconfig)
> {
> struct rkisp1_device *rkisp1 = params->rkisp1;
>- unsigned int lsc_status, sram_addr, lsc_table_sel, i, j;
>+ u32 lsc_status, sram_addr, lsc_table_sel;
>+ unsigned int i, j;
>
> lsc_status = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_STATUS);
>
>@@ -316,8 +318,8 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
> const struct rkisp1_cif_isp_lsc_config *arg)
> {
> struct rkisp1_device *rkisp1 = params->rkisp1;
>- unsigned int i, data;
>- u32 lsc_ctrl;
>+ u32 lsc_ctrl, data;
>+ unsigned int i;
>
> /* To config must be off , store the current status firstly */
> lsc_ctrl = rkisp1_read(rkisp1, RKISP1_CIF_ISP_LSC_CTRL);
>--
>Regards,
>
>Laurent Pinchart
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 3/5] media: rkisp1: Simplify LSC x/y size and grad register macros
2022-08-17 2:18 ` Laurent Pinchart
@ 2022-08-18 2:39 ` Dafna Hirschfeld
-1 siblings, 0 replies; 46+ messages in thread
From: Dafna Hirschfeld @ 2022-08-18 2:39 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
On 17.08.2022 05:18, Laurent Pinchart wrote:
>The LSC module x/y size and grad configuration is stored in a set of 4
>indexed registers each. The rkisp1-regs.h header defines all those
>registers, but only the first one in each set is used, with manual
>calculation of addresses of subsequent registers. Simplifies this by
>merging all 4 register macros into one that takes the index as a
>parameter. No functional change intended.
>
>Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Dafna Hirschfeld <dafna@fastmail.com>
>---
> .../platform/rockchip/rkisp1/rkisp1-params.c | 8 ++++----
> .../platform/rockchip/rkisp1/rkisp1-regs.h | 20 ++++---------------
> 2 files changed, 8 insertions(+), 20 deletions(-)
>
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>index dbe826fd02d2..aa6efa4c6e9e 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>@@ -331,22 +331,22 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
> /* program x size tables */
> data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_size_tbl[i * 2],
> arg->x_size_tbl[i * 2 + 1]);
>- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE_01 + i * 4, data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE(i), data);
>
> /* program x grad tables */
> data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2],
> arg->x_grad_tbl[i * 2 + 1]);
>- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD_01 + i * 4, data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD(i), data);
>
> /* program y size tables */
> data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_size_tbl[i * 2],
> arg->y_size_tbl[i * 2 + 1]);
>- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE_01 + i * 4, data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE(i), data);
>
> /* program y grad tables */
> data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2],
> arg->y_grad_tbl[i * 2 + 1]);
>- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD_01 + i * 4, data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD(i), data);
> }
>
> /* restore the lsc ctrl status */
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
>index 044af3d6e4f3..2ad24deedec8 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
>@@ -1162,22 +1162,10 @@
> #define RKISP1_CIF_ISP_LSC_GR_TABLE_DATA (RKISP1_CIF_ISP_LSC_BASE + 0x00000018)
> #define RKISP1_CIF_ISP_LSC_B_TABLE_DATA (RKISP1_CIF_ISP_LSC_BASE + 0x0000001C)
> #define RKISP1_CIF_ISP_LSC_GB_TABLE_DATA (RKISP1_CIF_ISP_LSC_BASE + 0x00000020)
>-#define RKISP1_CIF_ISP_LSC_XGRAD_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000024)
>-#define RKISP1_CIF_ISP_LSC_XGRAD_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000028)
>-#define RKISP1_CIF_ISP_LSC_XGRAD_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000002C)
>-#define RKISP1_CIF_ISP_LSC_XGRAD_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000030)
>-#define RKISP1_CIF_ISP_LSC_YGRAD_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000034)
>-#define RKISP1_CIF_ISP_LSC_YGRAD_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000038)
>-#define RKISP1_CIF_ISP_LSC_YGRAD_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000003C)
>-#define RKISP1_CIF_ISP_LSC_YGRAD_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000040)
>-#define RKISP1_CIF_ISP_LSC_XSIZE_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000044)
>-#define RKISP1_CIF_ISP_LSC_XSIZE_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000048)
>-#define RKISP1_CIF_ISP_LSC_XSIZE_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000004C)
>-#define RKISP1_CIF_ISP_LSC_XSIZE_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000050)
>-#define RKISP1_CIF_ISP_LSC_YSIZE_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000054)
>-#define RKISP1_CIF_ISP_LSC_YSIZE_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000058)
>-#define RKISP1_CIF_ISP_LSC_YSIZE_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000005C)
>-#define RKISP1_CIF_ISP_LSC_YSIZE_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000060)
>+#define RKISP1_CIF_ISP_LSC_XGRAD(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000024 + (n) * 4)
>+#define RKISP1_CIF_ISP_LSC_YGRAD(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000034 + (n) * 4)
>+#define RKISP1_CIF_ISP_LSC_XSIZE(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000044 + (n) * 4)
>+#define RKISP1_CIF_ISP_LSC_YSIZE(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000054 + (n) * 4)
> #define RKISP1_CIF_ISP_LSC_TABLE_SEL (RKISP1_CIF_ISP_LSC_BASE + 0x00000064)
> #define RKISP1_CIF_ISP_LSC_STATUS (RKISP1_CIF_ISP_LSC_BASE + 0x00000068)
>
>--
>Regards,
>
>Laurent Pinchart
>
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 3/5] media: rkisp1: Simplify LSC x/y size and grad register macros
@ 2022-08-18 2:39 ` Dafna Hirschfeld
0 siblings, 0 replies; 46+ messages in thread
From: Dafna Hirschfeld @ 2022-08-18 2:39 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
On 17.08.2022 05:18, Laurent Pinchart wrote:
>The LSC module x/y size and grad configuration is stored in a set of 4
>indexed registers each. The rkisp1-regs.h header defines all those
>registers, but only the first one in each set is used, with manual
>calculation of addresses of subsequent registers. Simplifies this by
>merging all 4 register macros into one that takes the index as a
>parameter. No functional change intended.
>
>Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Dafna Hirschfeld <dafna@fastmail.com>
>---
> .../platform/rockchip/rkisp1/rkisp1-params.c | 8 ++++----
> .../platform/rockchip/rkisp1/rkisp1-regs.h | 20 ++++---------------
> 2 files changed, 8 insertions(+), 20 deletions(-)
>
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>index dbe826fd02d2..aa6efa4c6e9e 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>@@ -331,22 +331,22 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
> /* program x size tables */
> data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_size_tbl[i * 2],
> arg->x_size_tbl[i * 2 + 1]);
>- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE_01 + i * 4, data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE(i), data);
>
> /* program x grad tables */
> data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2],
> arg->x_grad_tbl[i * 2 + 1]);
>- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD_01 + i * 4, data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD(i), data);
>
> /* program y size tables */
> data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_size_tbl[i * 2],
> arg->y_size_tbl[i * 2 + 1]);
>- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE_01 + i * 4, data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE(i), data);
>
> /* program y grad tables */
> data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2],
> arg->y_grad_tbl[i * 2 + 1]);
>- rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD_01 + i * 4, data);
>+ rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD(i), data);
> }
>
> /* restore the lsc ctrl status */
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
>index 044af3d6e4f3..2ad24deedec8 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
>@@ -1162,22 +1162,10 @@
> #define RKISP1_CIF_ISP_LSC_GR_TABLE_DATA (RKISP1_CIF_ISP_LSC_BASE + 0x00000018)
> #define RKISP1_CIF_ISP_LSC_B_TABLE_DATA (RKISP1_CIF_ISP_LSC_BASE + 0x0000001C)
> #define RKISP1_CIF_ISP_LSC_GB_TABLE_DATA (RKISP1_CIF_ISP_LSC_BASE + 0x00000020)
>-#define RKISP1_CIF_ISP_LSC_XGRAD_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000024)
>-#define RKISP1_CIF_ISP_LSC_XGRAD_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000028)
>-#define RKISP1_CIF_ISP_LSC_XGRAD_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000002C)
>-#define RKISP1_CIF_ISP_LSC_XGRAD_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000030)
>-#define RKISP1_CIF_ISP_LSC_YGRAD_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000034)
>-#define RKISP1_CIF_ISP_LSC_YGRAD_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000038)
>-#define RKISP1_CIF_ISP_LSC_YGRAD_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000003C)
>-#define RKISP1_CIF_ISP_LSC_YGRAD_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000040)
>-#define RKISP1_CIF_ISP_LSC_XSIZE_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000044)
>-#define RKISP1_CIF_ISP_LSC_XSIZE_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000048)
>-#define RKISP1_CIF_ISP_LSC_XSIZE_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000004C)
>-#define RKISP1_CIF_ISP_LSC_XSIZE_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000050)
>-#define RKISP1_CIF_ISP_LSC_YSIZE_01 (RKISP1_CIF_ISP_LSC_BASE + 0x00000054)
>-#define RKISP1_CIF_ISP_LSC_YSIZE_23 (RKISP1_CIF_ISP_LSC_BASE + 0x00000058)
>-#define RKISP1_CIF_ISP_LSC_YSIZE_45 (RKISP1_CIF_ISP_LSC_BASE + 0x0000005C)
>-#define RKISP1_CIF_ISP_LSC_YSIZE_67 (RKISP1_CIF_ISP_LSC_BASE + 0x00000060)
>+#define RKISP1_CIF_ISP_LSC_XGRAD(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000024 + (n) * 4)
>+#define RKISP1_CIF_ISP_LSC_YGRAD(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000034 + (n) * 4)
>+#define RKISP1_CIF_ISP_LSC_XSIZE(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000044 + (n) * 4)
>+#define RKISP1_CIF_ISP_LSC_YSIZE(n) (RKISP1_CIF_ISP_LSC_BASE + 0x00000054 + (n) * 4)
> #define RKISP1_CIF_ISP_LSC_TABLE_SEL (RKISP1_CIF_ISP_LSC_BASE + 0x00000064)
> #define RKISP1_CIF_ISP_LSC_STATUS (RKISP1_CIF_ISP_LSC_BASE + 0x00000068)
>
>--
>Regards,
>
>Laurent Pinchart
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 4/5] media: rkisp1: Use RKISP1_CIF_ISP_LSC_GRAD_SIZE() for gradient registers
2022-08-17 2:18 ` Laurent Pinchart
@ 2022-08-18 2:50 ` Dafna Hirschfeld
-1 siblings, 0 replies; 46+ messages in thread
From: Dafna Hirschfeld @ 2022-08-18 2:50 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
On 17.08.2022 05:18, Laurent Pinchart wrote:
>The rkisp1_lsc_config() function incorrectly uses the
>RKISP1_CIF_ISP_LSC_SECT_SIZE() macro for the gradient registers. Replace
>it with the correct RKISP1_CIF_ISP_LSC_GRAD_SIZE() macro. This doesn't
>cause any functional change as the two macros are defined identically
>(the size and gradient registers store fields in the same number of bits
>at the same positions).
>
>Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>---
> drivers/media/platform/rockchip/rkisp1/rkisp1-params.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>index aa6efa4c6e9e..421ade177b2d 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>@@ -334,7 +334,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE(i), data);
>
> /* program x grad tables */
>- data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2],
>+ data = RKISP1_CIF_ISP_LSC_GRAD_SIZE(arg->x_grad_tbl[i * 2],
> arg->x_grad_tbl[i * 2 + 1]);
maybe the GRAD macro should change to:
RKISP1_CIF_ISP_LSC_SECT_GRAD
?
thanks,
Dafna
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD(i), data);
>
>@@ -344,7 +344,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE(i), data);
>
> /* program y grad tables */
>- data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2],
>+ data = RKISP1_CIF_ISP_LSC_GRAD_SIZE(arg->y_grad_tbl[i * 2],
> arg->y_grad_tbl[i * 2 + 1]);
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD(i), data);
> }
>--
>Regards,
>
>Laurent Pinchart
>
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 4/5] media: rkisp1: Use RKISP1_CIF_ISP_LSC_GRAD_SIZE() for gradient registers
@ 2022-08-18 2:50 ` Dafna Hirschfeld
0 siblings, 0 replies; 46+ messages in thread
From: Dafna Hirschfeld @ 2022-08-18 2:50 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
On 17.08.2022 05:18, Laurent Pinchart wrote:
>The rkisp1_lsc_config() function incorrectly uses the
>RKISP1_CIF_ISP_LSC_SECT_SIZE() macro for the gradient registers. Replace
>it with the correct RKISP1_CIF_ISP_LSC_GRAD_SIZE() macro. This doesn't
>cause any functional change as the two macros are defined identically
>(the size and gradient registers store fields in the same number of bits
>at the same positions).
>
>Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>---
> drivers/media/platform/rockchip/rkisp1/rkisp1-params.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>index aa6efa4c6e9e..421ade177b2d 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>@@ -334,7 +334,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE(i), data);
>
> /* program x grad tables */
>- data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2],
>+ data = RKISP1_CIF_ISP_LSC_GRAD_SIZE(arg->x_grad_tbl[i * 2],
> arg->x_grad_tbl[i * 2 + 1]);
maybe the GRAD macro should change to:
RKISP1_CIF_ISP_LSC_SECT_GRAD
?
thanks,
Dafna
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD(i), data);
>
>@@ -344,7 +344,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE(i), data);
>
> /* program y grad tables */
>- data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2],
>+ data = RKISP1_CIF_ISP_LSC_GRAD_SIZE(arg->y_grad_tbl[i * 2],
> arg->y_grad_tbl[i * 2 + 1]);
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD(i), data);
> }
>--
>Regards,
>
>Laurent Pinchart
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 5/5] media: rkisp1: Configure LSC after enabling the ISP
2022-08-17 2:18 ` Laurent Pinchart
@ 2022-08-18 3:45 ` Dafna Hirschfeld
-1 siblings, 0 replies; 46+ messages in thread
From: Dafna Hirschfeld @ 2022-08-18 3:45 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
On 17.08.2022 05:18, Laurent Pinchart wrote:
>The ISP8000Nano v18.02 (found in the i.MX8MP) requires the ISP to be
>enabled (as indicated by the ISP_CTRL.ISP_ENABLE bit) to configure the
>lens shading table in internal RAM. The driver currently configures all
>ISP initial parameters before enabling the ISP, which causes the LSC RAM
>to not be initialized properly.
>
>To fix this, split the rkisp1_params_configure() function into a
>rkisp1_params_pre_configure() and a rkisp1_params_post_configure(). The
>former configures all ISP parameters but LSC, while the latter
>configures LSC. To implement this, the rkisp1_params_apply_params_cfg()
>function is deconstructed, with two small helpers created to deal with
>the parameters buffers, which are then used in rkisp1_params_isr(),
>rkisp1_params_pre_configure() and rkisp1_params_post_configure().
>
>While this initialization ordering is only needed for the ISP8000Nano
>v18.02, it doesn't affect other ISP versions negatively, and can thus be
>followed unconditionally.
>
>Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>---
> .../platform/rockchip/rkisp1/rkisp1-common.h | 29 ++-
> .../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
> .../platform/rockchip/rkisp1/rkisp1-params.c | 169 ++++++++++++------
> 3 files changed, 143 insertions(+), 64 deletions(-)
>
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>index 1383c13e22b8..f612e1b42b91 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>@@ -589,19 +589,32 @@ void rkisp1_sd_adjust_crop(struct v4l2_rect *crop,
> */
> const struct rkisp1_mbus_info *rkisp1_mbus_info_get_by_code(u32 mbus_code);
>
>-/* rkisp1_params_configure - configure the params when stream starts.
>- * This function is called by the isp entity upon stream starts.
>- * The function applies the initial configuration of the parameters.
>+/*
>+ * rkisp1_params_pre_configure - Configure the params before stream start
> *
>- * @params: pointer to rkisp1_params.
>+ * @params: pointer to rkisp1_params
> * @bayer_pat: the bayer pattern on the isp video sink pad
> * @quantization: the quantization configured on the isp's src pad
> * @ycbcr_encoding: the ycbcr_encoding configured on the isp's src pad
>+ *
>+ * This function is called by the ISP entity just before the ISP gets started.
>+ * It applies the initial ISP parameters from the first params buffer, but
>+ * skips LSC as it needs to be configured after the ISP is started.
> */
>-void rkisp1_params_configure(struct rkisp1_params *params,
>- enum rkisp1_fmt_raw_pat_type bayer_pat,
>- enum v4l2_quantization quantization,
>- enum v4l2_ycbcr_encoding ycbcr_encoding);
>+void rkisp1_params_pre_configure(struct rkisp1_params *params,
>+ enum rkisp1_fmt_raw_pat_type bayer_pat,
>+ enum v4l2_quantization quantization,
>+ enum v4l2_ycbcr_encoding ycbcr_encoding);
>+
>+/*
>+ * rkisp1_params_post_configure - Configure the params after stream start
>+ *
>+ * @params: pointer to rkisp1_params
>+ *
>+ * This function is called by the ISP entity just after the ISP gets started.
>+ * It applies the initial ISP KSC parameters from the first params buffer.
What is KSC ?
>+ */
>+void rkisp1_params_post_configure(struct rkisp1_params *params);
>
> /* rkisp1_params_disable - disable all parameters.
> * This function is called by the isp entity upon stream start
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>index c029d2e86717..4876bf890cb2 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>@@ -343,9 +343,9 @@ static int rkisp1_config_isp(struct rkisp1_isp *isp,
> src_frm = rkisp1_isp_get_pad_fmt(isp, NULL,
> RKISP1_ISP_PAD_SOURCE_VIDEO,
> V4L2_SUBDEV_FORMAT_ACTIVE);
>- rkisp1_params_configure(&rkisp1->params, sink_fmt->bayer_pat,
>- src_frm->quantization,
>- src_frm->ycbcr_enc);
>+ rkisp1_params_pre_configure(&rkisp1->params, sink_fmt->bayer_pat,
>+ src_frm->quantization,
>+ src_frm->ycbcr_enc);
> }
>
> return 0;
>@@ -462,6 +462,9 @@ static int rkisp1_isp_start(struct rkisp1_isp *isp, struct media_pad *source)
> RKISP1_CIF_ISP_CTRL_ISP_INFORM_ENABLE;
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
>
>+ if (isp->src_fmt->pixel_enc == V4L2_PIXEL_ENC_BAYER)
>+ rkisp1_params_post_configure(&rkisp1->params);
why is post config called only in case of bayer?
also I see that the lsc config from the isr is called without this condition.
In addition the post config also does 'complete buffer' so maybe you do want to
call it without the bayer condition.
>+
> return 0;
> }
>
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>index 421ade177b2d..a4664efdfea8 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>@@ -1297,22 +1297,6 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
> RKISP1_CIF_ISP_CTRL_ISP_GAMMA_IN_ENA);
> }
>
>- /* update lsc config */
>- if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
>- rkisp1_lsc_config(params,
>- &new_params->others.lsc_config);
>-
>- if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
>- if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
>- rkisp1_param_set_bits(params,
>- RKISP1_CIF_ISP_LSC_CTRL,
>- RKISP1_CIF_ISP_LSC_CTRL_ENA);
>- else
>- rkisp1_param_clear_bits(params,
>- RKISP1_CIF_ISP_LSC_CTRL,
>- RKISP1_CIF_ISP_LSC_CTRL_ENA);
>- }
>-
> /* update awb gains */
> if (module_cfg_update & RKISP1_CIF_ISP_MODULE_AWB_GAIN)
> params->ops->awb_gain_config(params, &new_params->others.awb_gain_config);
>@@ -1429,6 +1413,33 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
> }
> }
>
>+static void
>+rkisp1_isp_isr_lsc_config(struct rkisp1_params *params,
>+ const struct rkisp1_params_cfg *new_params)
>+{
>+ unsigned int module_en_update, module_cfg_update, module_ens;
>+
>+ module_en_update = new_params->module_en_update;
>+ module_cfg_update = new_params->module_cfg_update;
>+ module_ens = new_params->module_ens;
>+
>+ /* update lsc config */
>+ if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
>+ rkisp1_lsc_config(params,
>+ &new_params->others.lsc_config);
>+
>+ if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
>+ if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
>+ rkisp1_param_set_bits(params,
>+ RKISP1_CIF_ISP_LSC_CTRL,
>+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
>+ else
>+ rkisp1_param_clear_bits(params,
>+ RKISP1_CIF_ISP_LSC_CTRL,
>+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
>+ }
>+}
>+
> static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
> struct rkisp1_params_cfg *new_params)
> {
>@@ -1490,47 +1501,60 @@ static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
> }
> }
>
>-static void rkisp1_params_apply_params_cfg(struct rkisp1_params *params,
>- unsigned int frame_sequence)
>+static bool rkisp1_params_get_buffer(struct rkisp1_params *params,
>+ struct rkisp1_buffer **buf,
>+ struct rkisp1_params_cfg **cfg)
> {
>- struct rkisp1_params_cfg *new_params;
>- struct rkisp1_buffer *cur_buf = NULL;
>-
> if (list_empty(¶ms->params))
>- return;
>+ return false;
>
>- cur_buf = list_first_entry(¶ms->params,
>- struct rkisp1_buffer, queue);
>+ *buf = list_first_entry(¶ms->params, struct rkisp1_buffer, queue);
>+ *cfg = vb2_plane_vaddr(&(*buf)->vb.vb2_buf, 0);
>
>- new_params = (struct rkisp1_params_cfg *)vb2_plane_vaddr(&cur_buf->vb.vb2_buf, 0);
>+ return true;
>+}
>
>- rkisp1_isp_isr_other_config(params, new_params);
>- rkisp1_isp_isr_meas_config(params, new_params);
>+static void rkisp1_params_complete_buffer(struct rkisp1_params *params,
>+ struct rkisp1_buffer *buf,
>+ unsigned int frame_sequence)
>+{
>+ list_del(&buf->queue);
>
>- /* update shadow register immediately */
>- rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL, RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>-
>- list_del(&cur_buf->queue);
>-
>- cur_buf->vb.sequence = frame_sequence;
>- vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
>+ buf->vb.sequence = frame_sequence;
>+ vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
> }
>
> void rkisp1_params_isr(struct rkisp1_device *rkisp1)
> {
>- /*
>- * This isr is called when the ISR finishes processing a frame (RKISP1_CIF_ISP_FRAME).
>- * Configurations performed here will be applied on the next frame.
>- * Since frame_sequence is updated on the vertical sync signal, we should use
>- * frame_sequence + 1 here to indicate to userspace on which frame these parameters
>- * are being applied.
>- */
>- unsigned int frame_sequence = rkisp1->isp.frame_sequence + 1;
> struct rkisp1_params *params = &rkisp1->params;
>+ struct rkisp1_params_cfg *new_params;
>+ struct rkisp1_buffer *cur_buf;
>
> spin_lock(¶ms->config_lock);
>- rkisp1_params_apply_params_cfg(params, frame_sequence);
>
>+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>+ goto unlock;
>+
>+ rkisp1_isp_isr_other_config(params, new_params);
>+ rkisp1_isp_isr_lsc_config(params, new_params);
>+ rkisp1_isp_isr_meas_config(params, new_params);
>+
>+ /* update shadow register immediately */
>+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>+
>+ /*
>+ * This isr is called when the ISR finishes processing a frame
>+ * (RKISP1_CIF_ISP_FRAME). Configurations performed here will be
>+ * applied on the next frame. Since frame_sequence is updated on the
>+ * vertical sync signal, we should use frame_sequence + 1 here to
>+ * indicate to userspace on which frame these parameters are being
>+ * applied.
>+ */
>+ rkisp1_params_complete_buffer(params, cur_buf,
>+ rkisp1->isp.frame_sequence + 1);
>+
>+unlock:
> spin_unlock(¶ms->config_lock);
> }
>
>@@ -1573,9 +1597,18 @@ static const struct rkisp1_cif_isp_afc_config rkisp1_afc_params_default_config =
> 14
> };
>
>-static void rkisp1_params_config_parameter(struct rkisp1_params *params)
>+void rkisp1_params_pre_configure(struct rkisp1_params *params,
>+ enum rkisp1_fmt_raw_pat_type bayer_pat,
>+ enum v4l2_quantization quantization,
>+ enum v4l2_ycbcr_encoding ycbcr_encoding)
> {
> struct rkisp1_cif_isp_hst_config hst = rkisp1_hst_params_default_config;
>+ struct rkisp1_params_cfg *new_params;
>+ struct rkisp1_buffer *cur_buf;
>+
>+ params->quantization = quantization;
>+ params->ycbcr_encoding = ycbcr_encoding;
>+ params->raw_type = bayer_pat;
>
> params->ops->awb_meas_config(params, &rkisp1_awb_params_default_config);
> params->ops->awb_meas_enable(params, &rkisp1_awb_params_default_config,
>@@ -1599,20 +1632,50 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params)
> spin_lock_irq(¶ms->config_lock);
>
> /* apply the first buffer if there is one already */
>- rkisp1_params_apply_params_cfg(params, 0);
>
>+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>+ goto unlock;
>+
>+ rkisp1_isp_isr_other_config(params, new_params);
>+ rkisp1_isp_isr_meas_config(params, new_params);
>+
>+ /* update shadow register immediately */
>+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>+
>+unlock:
> spin_unlock_irq(¶ms->config_lock);
> }
>
>-void rkisp1_params_configure(struct rkisp1_params *params,
>- enum rkisp1_fmt_raw_pat_type bayer_pat,
>- enum v4l2_quantization quantization,
>- enum v4l2_ycbcr_encoding ycbcr_encoding)
>+void rkisp1_params_post_configure(struct rkisp1_params *params)
> {
>- params->quantization = quantization;
>- params->ycbcr_encoding = ycbcr_encoding;
>- params->raw_type = bayer_pat;
>- rkisp1_params_config_parameter(params);
>+ struct rkisp1_params_cfg *new_params;
>+ struct rkisp1_buffer *cur_buf;
>+
>+ spin_lock_irq(¶ms->config_lock);
>+
>+ /*
>+ * Apply LSC parameters from the first buffer (if any is already
>+ * available. This must be done after the ISP gets started in the
>+ * ISP8000Nano v18.02 (found in the i.MX8MP) as access to the LSC RAM
>+ * is gated by the ISP_CTRL.ISP_ENABLE bit. As this initialization
>+ * ordering doesn't affect other ISP versions negatively, do so
>+ * unconditionally.
>+ */
>+
>+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>+ goto unlock;
>+
>+ rkisp1_isp_isr_lsc_config(params, new_params);
>+
>+ /* update shadow register immediately */
>+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
updating the shadow regs is already done in the 'complete buffer'
Thanks,
Dafna
>+
>+ rkisp1_params_complete_buffer(params, cur_buf, 0);
>+
>+unlock:
>+ spin_unlock_irq(¶ms->config_lock);
> }
>
> /*
>--
>Regards,
>
>Laurent Pinchart
>
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 5/5] media: rkisp1: Configure LSC after enabling the ISP
@ 2022-08-18 3:45 ` Dafna Hirschfeld
0 siblings, 0 replies; 46+ messages in thread
From: Dafna Hirschfeld @ 2022-08-18 3:45 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
On 17.08.2022 05:18, Laurent Pinchart wrote:
>The ISP8000Nano v18.02 (found in the i.MX8MP) requires the ISP to be
>enabled (as indicated by the ISP_CTRL.ISP_ENABLE bit) to configure the
>lens shading table in internal RAM. The driver currently configures all
>ISP initial parameters before enabling the ISP, which causes the LSC RAM
>to not be initialized properly.
>
>To fix this, split the rkisp1_params_configure() function into a
>rkisp1_params_pre_configure() and a rkisp1_params_post_configure(). The
>former configures all ISP parameters but LSC, while the latter
>configures LSC. To implement this, the rkisp1_params_apply_params_cfg()
>function is deconstructed, with two small helpers created to deal with
>the parameters buffers, which are then used in rkisp1_params_isr(),
>rkisp1_params_pre_configure() and rkisp1_params_post_configure().
>
>While this initialization ordering is only needed for the ISP8000Nano
>v18.02, it doesn't affect other ISP versions negatively, and can thus be
>followed unconditionally.
>
>Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>---
> .../platform/rockchip/rkisp1/rkisp1-common.h | 29 ++-
> .../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
> .../platform/rockchip/rkisp1/rkisp1-params.c | 169 ++++++++++++------
> 3 files changed, 143 insertions(+), 64 deletions(-)
>
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>index 1383c13e22b8..f612e1b42b91 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>@@ -589,19 +589,32 @@ void rkisp1_sd_adjust_crop(struct v4l2_rect *crop,
> */
> const struct rkisp1_mbus_info *rkisp1_mbus_info_get_by_code(u32 mbus_code);
>
>-/* rkisp1_params_configure - configure the params when stream starts.
>- * This function is called by the isp entity upon stream starts.
>- * The function applies the initial configuration of the parameters.
>+/*
>+ * rkisp1_params_pre_configure - Configure the params before stream start
> *
>- * @params: pointer to rkisp1_params.
>+ * @params: pointer to rkisp1_params
> * @bayer_pat: the bayer pattern on the isp video sink pad
> * @quantization: the quantization configured on the isp's src pad
> * @ycbcr_encoding: the ycbcr_encoding configured on the isp's src pad
>+ *
>+ * This function is called by the ISP entity just before the ISP gets started.
>+ * It applies the initial ISP parameters from the first params buffer, but
>+ * skips LSC as it needs to be configured after the ISP is started.
> */
>-void rkisp1_params_configure(struct rkisp1_params *params,
>- enum rkisp1_fmt_raw_pat_type bayer_pat,
>- enum v4l2_quantization quantization,
>- enum v4l2_ycbcr_encoding ycbcr_encoding);
>+void rkisp1_params_pre_configure(struct rkisp1_params *params,
>+ enum rkisp1_fmt_raw_pat_type bayer_pat,
>+ enum v4l2_quantization quantization,
>+ enum v4l2_ycbcr_encoding ycbcr_encoding);
>+
>+/*
>+ * rkisp1_params_post_configure - Configure the params after stream start
>+ *
>+ * @params: pointer to rkisp1_params
>+ *
>+ * This function is called by the ISP entity just after the ISP gets started.
>+ * It applies the initial ISP KSC parameters from the first params buffer.
What is KSC ?
>+ */
>+void rkisp1_params_post_configure(struct rkisp1_params *params);
>
> /* rkisp1_params_disable - disable all parameters.
> * This function is called by the isp entity upon stream start
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>index c029d2e86717..4876bf890cb2 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>@@ -343,9 +343,9 @@ static int rkisp1_config_isp(struct rkisp1_isp *isp,
> src_frm = rkisp1_isp_get_pad_fmt(isp, NULL,
> RKISP1_ISP_PAD_SOURCE_VIDEO,
> V4L2_SUBDEV_FORMAT_ACTIVE);
>- rkisp1_params_configure(&rkisp1->params, sink_fmt->bayer_pat,
>- src_frm->quantization,
>- src_frm->ycbcr_enc);
>+ rkisp1_params_pre_configure(&rkisp1->params, sink_fmt->bayer_pat,
>+ src_frm->quantization,
>+ src_frm->ycbcr_enc);
> }
>
> return 0;
>@@ -462,6 +462,9 @@ static int rkisp1_isp_start(struct rkisp1_isp *isp, struct media_pad *source)
> RKISP1_CIF_ISP_CTRL_ISP_INFORM_ENABLE;
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
>
>+ if (isp->src_fmt->pixel_enc == V4L2_PIXEL_ENC_BAYER)
>+ rkisp1_params_post_configure(&rkisp1->params);
why is post config called only in case of bayer?
also I see that the lsc config from the isr is called without this condition.
In addition the post config also does 'complete buffer' so maybe you do want to
call it without the bayer condition.
>+
> return 0;
> }
>
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>index 421ade177b2d..a4664efdfea8 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>@@ -1297,22 +1297,6 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
> RKISP1_CIF_ISP_CTRL_ISP_GAMMA_IN_ENA);
> }
>
>- /* update lsc config */
>- if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
>- rkisp1_lsc_config(params,
>- &new_params->others.lsc_config);
>-
>- if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
>- if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
>- rkisp1_param_set_bits(params,
>- RKISP1_CIF_ISP_LSC_CTRL,
>- RKISP1_CIF_ISP_LSC_CTRL_ENA);
>- else
>- rkisp1_param_clear_bits(params,
>- RKISP1_CIF_ISP_LSC_CTRL,
>- RKISP1_CIF_ISP_LSC_CTRL_ENA);
>- }
>-
> /* update awb gains */
> if (module_cfg_update & RKISP1_CIF_ISP_MODULE_AWB_GAIN)
> params->ops->awb_gain_config(params, &new_params->others.awb_gain_config);
>@@ -1429,6 +1413,33 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
> }
> }
>
>+static void
>+rkisp1_isp_isr_lsc_config(struct rkisp1_params *params,
>+ const struct rkisp1_params_cfg *new_params)
>+{
>+ unsigned int module_en_update, module_cfg_update, module_ens;
>+
>+ module_en_update = new_params->module_en_update;
>+ module_cfg_update = new_params->module_cfg_update;
>+ module_ens = new_params->module_ens;
>+
>+ /* update lsc config */
>+ if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
>+ rkisp1_lsc_config(params,
>+ &new_params->others.lsc_config);
>+
>+ if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
>+ if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
>+ rkisp1_param_set_bits(params,
>+ RKISP1_CIF_ISP_LSC_CTRL,
>+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
>+ else
>+ rkisp1_param_clear_bits(params,
>+ RKISP1_CIF_ISP_LSC_CTRL,
>+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
>+ }
>+}
>+
> static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
> struct rkisp1_params_cfg *new_params)
> {
>@@ -1490,47 +1501,60 @@ static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
> }
> }
>
>-static void rkisp1_params_apply_params_cfg(struct rkisp1_params *params,
>- unsigned int frame_sequence)
>+static bool rkisp1_params_get_buffer(struct rkisp1_params *params,
>+ struct rkisp1_buffer **buf,
>+ struct rkisp1_params_cfg **cfg)
> {
>- struct rkisp1_params_cfg *new_params;
>- struct rkisp1_buffer *cur_buf = NULL;
>-
> if (list_empty(¶ms->params))
>- return;
>+ return false;
>
>- cur_buf = list_first_entry(¶ms->params,
>- struct rkisp1_buffer, queue);
>+ *buf = list_first_entry(¶ms->params, struct rkisp1_buffer, queue);
>+ *cfg = vb2_plane_vaddr(&(*buf)->vb.vb2_buf, 0);
>
>- new_params = (struct rkisp1_params_cfg *)vb2_plane_vaddr(&cur_buf->vb.vb2_buf, 0);
>+ return true;
>+}
>
>- rkisp1_isp_isr_other_config(params, new_params);
>- rkisp1_isp_isr_meas_config(params, new_params);
>+static void rkisp1_params_complete_buffer(struct rkisp1_params *params,
>+ struct rkisp1_buffer *buf,
>+ unsigned int frame_sequence)
>+{
>+ list_del(&buf->queue);
>
>- /* update shadow register immediately */
>- rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL, RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>-
>- list_del(&cur_buf->queue);
>-
>- cur_buf->vb.sequence = frame_sequence;
>- vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
>+ buf->vb.sequence = frame_sequence;
>+ vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
> }
>
> void rkisp1_params_isr(struct rkisp1_device *rkisp1)
> {
>- /*
>- * This isr is called when the ISR finishes processing a frame (RKISP1_CIF_ISP_FRAME).
>- * Configurations performed here will be applied on the next frame.
>- * Since frame_sequence is updated on the vertical sync signal, we should use
>- * frame_sequence + 1 here to indicate to userspace on which frame these parameters
>- * are being applied.
>- */
>- unsigned int frame_sequence = rkisp1->isp.frame_sequence + 1;
> struct rkisp1_params *params = &rkisp1->params;
>+ struct rkisp1_params_cfg *new_params;
>+ struct rkisp1_buffer *cur_buf;
>
> spin_lock(¶ms->config_lock);
>- rkisp1_params_apply_params_cfg(params, frame_sequence);
>
>+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>+ goto unlock;
>+
>+ rkisp1_isp_isr_other_config(params, new_params);
>+ rkisp1_isp_isr_lsc_config(params, new_params);
>+ rkisp1_isp_isr_meas_config(params, new_params);
>+
>+ /* update shadow register immediately */
>+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>+
>+ /*
>+ * This isr is called when the ISR finishes processing a frame
>+ * (RKISP1_CIF_ISP_FRAME). Configurations performed here will be
>+ * applied on the next frame. Since frame_sequence is updated on the
>+ * vertical sync signal, we should use frame_sequence + 1 here to
>+ * indicate to userspace on which frame these parameters are being
>+ * applied.
>+ */
>+ rkisp1_params_complete_buffer(params, cur_buf,
>+ rkisp1->isp.frame_sequence + 1);
>+
>+unlock:
> spin_unlock(¶ms->config_lock);
> }
>
>@@ -1573,9 +1597,18 @@ static const struct rkisp1_cif_isp_afc_config rkisp1_afc_params_default_config =
> 14
> };
>
>-static void rkisp1_params_config_parameter(struct rkisp1_params *params)
>+void rkisp1_params_pre_configure(struct rkisp1_params *params,
>+ enum rkisp1_fmt_raw_pat_type bayer_pat,
>+ enum v4l2_quantization quantization,
>+ enum v4l2_ycbcr_encoding ycbcr_encoding)
> {
> struct rkisp1_cif_isp_hst_config hst = rkisp1_hst_params_default_config;
>+ struct rkisp1_params_cfg *new_params;
>+ struct rkisp1_buffer *cur_buf;
>+
>+ params->quantization = quantization;
>+ params->ycbcr_encoding = ycbcr_encoding;
>+ params->raw_type = bayer_pat;
>
> params->ops->awb_meas_config(params, &rkisp1_awb_params_default_config);
> params->ops->awb_meas_enable(params, &rkisp1_awb_params_default_config,
>@@ -1599,20 +1632,50 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params)
> spin_lock_irq(¶ms->config_lock);
>
> /* apply the first buffer if there is one already */
>- rkisp1_params_apply_params_cfg(params, 0);
>
>+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>+ goto unlock;
>+
>+ rkisp1_isp_isr_other_config(params, new_params);
>+ rkisp1_isp_isr_meas_config(params, new_params);
>+
>+ /* update shadow register immediately */
>+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>+
>+unlock:
> spin_unlock_irq(¶ms->config_lock);
> }
>
>-void rkisp1_params_configure(struct rkisp1_params *params,
>- enum rkisp1_fmt_raw_pat_type bayer_pat,
>- enum v4l2_quantization quantization,
>- enum v4l2_ycbcr_encoding ycbcr_encoding)
>+void rkisp1_params_post_configure(struct rkisp1_params *params)
> {
>- params->quantization = quantization;
>- params->ycbcr_encoding = ycbcr_encoding;
>- params->raw_type = bayer_pat;
>- rkisp1_params_config_parameter(params);
>+ struct rkisp1_params_cfg *new_params;
>+ struct rkisp1_buffer *cur_buf;
>+
>+ spin_lock_irq(¶ms->config_lock);
>+
>+ /*
>+ * Apply LSC parameters from the first buffer (if any is already
>+ * available. This must be done after the ISP gets started in the
>+ * ISP8000Nano v18.02 (found in the i.MX8MP) as access to the LSC RAM
>+ * is gated by the ISP_CTRL.ISP_ENABLE bit. As this initialization
>+ * ordering doesn't affect other ISP versions negatively, do so
>+ * unconditionally.
>+ */
>+
>+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>+ goto unlock;
>+
>+ rkisp1_isp_isr_lsc_config(params, new_params);
>+
>+ /* update shadow register immediately */
>+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
updating the shadow regs is already done in the 'complete buffer'
Thanks,
Dafna
>+
>+ rkisp1_params_complete_buffer(params, cur_buf, 0);
>+
>+unlock:
>+ spin_unlock_irq(¶ms->config_lock);
> }
>
> /*
>--
>Regards,
>
>Laurent Pinchart
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 4/5] media: rkisp1: Use RKISP1_CIF_ISP_LSC_GRAD_SIZE() for gradient registers
2022-08-18 2:50 ` Dafna Hirschfeld
@ 2022-08-18 6:17 ` Laurent Pinchart
-1 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-08-18 6:17 UTC (permalink / raw)
To: Dafna Hirschfeld
Cc: linux-media, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
Hi Dafna,
On Thu, Aug 18, 2022 at 05:50:29AM +0300, Dafna Hirschfeld wrote:
> On 17.08.2022 05:18, Laurent Pinchart wrote:
> > The rkisp1_lsc_config() function incorrectly uses the
> > RKISP1_CIF_ISP_LSC_SECT_SIZE() macro for the gradient registers. Replace
> > it with the correct RKISP1_CIF_ISP_LSC_GRAD_SIZE() macro. This doesn't
> > cause any functional change as the two macros are defined identically
> > (the size and gradient registers store fields in the same number of bits
> > at the same positions).
> >
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > ---
> > drivers/media/platform/rockchip/rkisp1/rkisp1-params.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> > index aa6efa4c6e9e..421ade177b2d 100644
> > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> > @@ -334,7 +334,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
> > rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE(i), data);
> >
> > /* program x grad tables */
> > - data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2],
> > + data = RKISP1_CIF_ISP_LSC_GRAD_SIZE(arg->x_grad_tbl[i * 2],
> > arg->x_grad_tbl[i * 2 + 1]);
>
> maybe the GRAD macro should change to:
>
> RKISP1_CIF_ISP_LSC_SECT_GRAD
>
> ?
Good idea, I'll do that.
> > rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD(i), data);
> >
> > @@ -344,7 +344,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
> > rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE(i), data);
> >
> > /* program y grad tables */
> > - data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2],
> > + data = RKISP1_CIF_ISP_LSC_GRAD_SIZE(arg->y_grad_tbl[i * 2],
> > arg->y_grad_tbl[i * 2 + 1]);
> > rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD(i), data);
> > }
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 4/5] media: rkisp1: Use RKISP1_CIF_ISP_LSC_GRAD_SIZE() for gradient registers
@ 2022-08-18 6:17 ` Laurent Pinchart
0 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-08-18 6:17 UTC (permalink / raw)
To: Dafna Hirschfeld
Cc: linux-media, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
Hi Dafna,
On Thu, Aug 18, 2022 at 05:50:29AM +0300, Dafna Hirschfeld wrote:
> On 17.08.2022 05:18, Laurent Pinchart wrote:
> > The rkisp1_lsc_config() function incorrectly uses the
> > RKISP1_CIF_ISP_LSC_SECT_SIZE() macro for the gradient registers. Replace
> > it with the correct RKISP1_CIF_ISP_LSC_GRAD_SIZE() macro. This doesn't
> > cause any functional change as the two macros are defined identically
> > (the size and gradient registers store fields in the same number of bits
> > at the same positions).
> >
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > ---
> > drivers/media/platform/rockchip/rkisp1/rkisp1-params.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> > index aa6efa4c6e9e..421ade177b2d 100644
> > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> > @@ -334,7 +334,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
> > rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE(i), data);
> >
> > /* program x grad tables */
> > - data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2],
> > + data = RKISP1_CIF_ISP_LSC_GRAD_SIZE(arg->x_grad_tbl[i * 2],
> > arg->x_grad_tbl[i * 2 + 1]);
>
> maybe the GRAD macro should change to:
>
> RKISP1_CIF_ISP_LSC_SECT_GRAD
>
> ?
Good idea, I'll do that.
> > rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD(i), data);
> >
> > @@ -344,7 +344,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
> > rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE(i), data);
> >
> > /* program y grad tables */
> > - data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2],
> > + data = RKISP1_CIF_ISP_LSC_GRAD_SIZE(arg->y_grad_tbl[i * 2],
> > arg->y_grad_tbl[i * 2 + 1]);
> > rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD(i), data);
> > }
--
Regards,
Laurent Pinchart
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 5/5] media: rkisp1: Configure LSC after enabling the ISP
2022-08-18 3:45 ` Dafna Hirschfeld
@ 2022-08-18 6:25 ` Laurent Pinchart
-1 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-08-18 6:25 UTC (permalink / raw)
To: Dafna Hirschfeld
Cc: linux-media, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
Hi Dafna,
On Thu, Aug 18, 2022 at 06:45:46AM +0300, Dafna Hirschfeld wrote:
> On 17.08.2022 05:18, Laurent Pinchart wrote:
> > The ISP8000Nano v18.02 (found in the i.MX8MP) requires the ISP to be
> > enabled (as indicated by the ISP_CTRL.ISP_ENABLE bit) to configure the
> > lens shading table in internal RAM. The driver currently configures all
> > ISP initial parameters before enabling the ISP, which causes the LSC RAM
> > to not be initialized properly.
> >
> > To fix this, split the rkisp1_params_configure() function into a
> > rkisp1_params_pre_configure() and a rkisp1_params_post_configure(). The
> > former configures all ISP parameters but LSC, while the latter
> > configures LSC. To implement this, the rkisp1_params_apply_params_cfg()
> > function is deconstructed, with two small helpers created to deal with
> > the parameters buffers, which are then used in rkisp1_params_isr(),
> > rkisp1_params_pre_configure() and rkisp1_params_post_configure().
> >
> > While this initialization ordering is only needed for the ISP8000Nano
> > v18.02, it doesn't affect other ISP versions negatively, and can thus be
> > followed unconditionally.
> >
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > ---
> > .../platform/rockchip/rkisp1/rkisp1-common.h | 29 ++-
> > .../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
> > .../platform/rockchip/rkisp1/rkisp1-params.c | 169 ++++++++++++------
> > 3 files changed, 143 insertions(+), 64 deletions(-)
> >
> > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
> > index 1383c13e22b8..f612e1b42b91 100644
> > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
> > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
> > @@ -589,19 +589,32 @@ void rkisp1_sd_adjust_crop(struct v4l2_rect *crop,
> > */
> > const struct rkisp1_mbus_info *rkisp1_mbus_info_get_by_code(u32 mbus_code);
> >
> > -/* rkisp1_params_configure - configure the params when stream starts.
> > - * This function is called by the isp entity upon stream starts.
> > - * The function applies the initial configuration of the parameters.
> > +/*
> > + * rkisp1_params_pre_configure - Configure the params before stream start
> > *
> > - * @params: pointer to rkisp1_params.
> > + * @params: pointer to rkisp1_params
> > * @bayer_pat: the bayer pattern on the isp video sink pad
> > * @quantization: the quantization configured on the isp's src pad
> > * @ycbcr_encoding: the ycbcr_encoding configured on the isp's src pad
> > + *
> > + * This function is called by the ISP entity just before the ISP gets started.
> > + * It applies the initial ISP parameters from the first params buffer, but
> > + * skips LSC as it needs to be configured after the ISP is started.
> > */
> > -void rkisp1_params_configure(struct rkisp1_params *params,
> > - enum rkisp1_fmt_raw_pat_type bayer_pat,
> > - enum v4l2_quantization quantization,
> > - enum v4l2_ycbcr_encoding ycbcr_encoding);
> > +void rkisp1_params_pre_configure(struct rkisp1_params *params,
> > + enum rkisp1_fmt_raw_pat_type bayer_pat,
> > + enum v4l2_quantization quantization,
> > + enum v4l2_ycbcr_encoding ycbcr_encoding);
> > +
> > +/*
> > + * rkisp1_params_post_configure - Configure the params after stream start
> > + *
> > + * @params: pointer to rkisp1_params
> > + *
> > + * This function is called by the ISP entity just after the ISP gets started.
> > + * It applies the initial ISP KSC parameters from the first params buffer.
>
> What is KSC ?
An incorrect spelling of LSC :-) I'll fix it.
> > + */
> > +void rkisp1_params_post_configure(struct rkisp1_params *params);
> >
> > /* rkisp1_params_disable - disable all parameters.
> > * This function is called by the isp entity upon stream start
> > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> > index c029d2e86717..4876bf890cb2 100644
> > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> > @@ -343,9 +343,9 @@ static int rkisp1_config_isp(struct rkisp1_isp *isp,
> > src_frm = rkisp1_isp_get_pad_fmt(isp, NULL,
> > RKISP1_ISP_PAD_SOURCE_VIDEO,
> > V4L2_SUBDEV_FORMAT_ACTIVE);
> > - rkisp1_params_configure(&rkisp1->params, sink_fmt->bayer_pat,
> > - src_frm->quantization,
> > - src_frm->ycbcr_enc);
> > + rkisp1_params_pre_configure(&rkisp1->params, sink_fmt->bayer_pat,
> > + src_frm->quantization,
> > + src_frm->ycbcr_enc);
> > }
> >
> > return 0;
> > @@ -462,6 +462,9 @@ static int rkisp1_isp_start(struct rkisp1_isp *isp, struct media_pad *source)
> > RKISP1_CIF_ISP_CTRL_ISP_INFORM_ENABLE;
> > rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
> >
> > + if (isp->src_fmt->pixel_enc == V4L2_PIXEL_ENC_BAYER)
> > + rkisp1_params_post_configure(&rkisp1->params);
>
> why is post config called only in case of bayer?
Because pre_configure is also called for Bayer input only. When the
input is YUV the ISP is bypassed, and the parameters are reset instead.
> also I see that the lsc config from the isr is called without this condition.
> In addition the post config also does 'complete buffer' so maybe you do want to
> call it without the bayer condition.
When the input is YUV there isn't supposed to be any ISP params buffers
queued. I don't know what will happen if userspace queues any, maybe
something bad, but this patch doesn't affect that behaviour as far as I
can tell. Further fixes, if required, would go on top.
> > +
> > return 0;
> > }
> >
> > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> > index 421ade177b2d..a4664efdfea8 100644
> > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> > @@ -1297,22 +1297,6 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
> > RKISP1_CIF_ISP_CTRL_ISP_GAMMA_IN_ENA);
> > }
> >
> > - /* update lsc config */
> > - if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
> > - rkisp1_lsc_config(params,
> > - &new_params->others.lsc_config);
> > -
> > - if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
> > - if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
> > - rkisp1_param_set_bits(params,
> > - RKISP1_CIF_ISP_LSC_CTRL,
> > - RKISP1_CIF_ISP_LSC_CTRL_ENA);
> > - else
> > - rkisp1_param_clear_bits(params,
> > - RKISP1_CIF_ISP_LSC_CTRL,
> > - RKISP1_CIF_ISP_LSC_CTRL_ENA);
> > - }
> > -
> > /* update awb gains */
> > if (module_cfg_update & RKISP1_CIF_ISP_MODULE_AWB_GAIN)
> > params->ops->awb_gain_config(params, &new_params->others.awb_gain_config);
> > @@ -1429,6 +1413,33 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
> > }
> > }
> >
> > +static void
> > +rkisp1_isp_isr_lsc_config(struct rkisp1_params *params,
> > + const struct rkisp1_params_cfg *new_params)
> > +{
> > + unsigned int module_en_update, module_cfg_update, module_ens;
> > +
> > + module_en_update = new_params->module_en_update;
> > + module_cfg_update = new_params->module_cfg_update;
> > + module_ens = new_params->module_ens;
> > +
> > + /* update lsc config */
> > + if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
> > + rkisp1_lsc_config(params,
> > + &new_params->others.lsc_config);
> > +
> > + if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
> > + if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
> > + rkisp1_param_set_bits(params,
> > + RKISP1_CIF_ISP_LSC_CTRL,
> > + RKISP1_CIF_ISP_LSC_CTRL_ENA);
> > + else
> > + rkisp1_param_clear_bits(params,
> > + RKISP1_CIF_ISP_LSC_CTRL,
> > + RKISP1_CIF_ISP_LSC_CTRL_ENA);
> > + }
> > +}
> > +
> > static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
> > struct rkisp1_params_cfg *new_params)
> > {
> > @@ -1490,47 +1501,60 @@ static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
> > }
> > }
> >
> > -static void rkisp1_params_apply_params_cfg(struct rkisp1_params *params,
> > - unsigned int frame_sequence)
> > +static bool rkisp1_params_get_buffer(struct rkisp1_params *params,
> > + struct rkisp1_buffer **buf,
> > + struct rkisp1_params_cfg **cfg)
> > {
> > - struct rkisp1_params_cfg *new_params;
> > - struct rkisp1_buffer *cur_buf = NULL;
> > -
> > if (list_empty(¶ms->params))
> > - return;
> > + return false;
> >
> > - cur_buf = list_first_entry(¶ms->params,
> > - struct rkisp1_buffer, queue);
> > + *buf = list_first_entry(¶ms->params, struct rkisp1_buffer, queue);
> > + *cfg = vb2_plane_vaddr(&(*buf)->vb.vb2_buf, 0);
> >
> > - new_params = (struct rkisp1_params_cfg *)vb2_plane_vaddr(&cur_buf->vb.vb2_buf, 0);
> > + return true;
> > +}
> >
> > - rkisp1_isp_isr_other_config(params, new_params);
> > - rkisp1_isp_isr_meas_config(params, new_params);
> > +static void rkisp1_params_complete_buffer(struct rkisp1_params *params,
> > + struct rkisp1_buffer *buf,
> > + unsigned int frame_sequence)
> > +{
> > + list_del(&buf->queue);
> >
> > - /* update shadow register immediately */
> > - rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL, RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
> > -
> > - list_del(&cur_buf->queue);
> > -
> > - cur_buf->vb.sequence = frame_sequence;
> > - vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
> > + buf->vb.sequence = frame_sequence;
> > + vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
> > }
> >
> > void rkisp1_params_isr(struct rkisp1_device *rkisp1)
> > {
> > - /*
> > - * This isr is called when the ISR finishes processing a frame (RKISP1_CIF_ISP_FRAME).
> > - * Configurations performed here will be applied on the next frame.
> > - * Since frame_sequence is updated on the vertical sync signal, we should use
> > - * frame_sequence + 1 here to indicate to userspace on which frame these parameters
> > - * are being applied.
> > - */
> > - unsigned int frame_sequence = rkisp1->isp.frame_sequence + 1;
> > struct rkisp1_params *params = &rkisp1->params;
> > + struct rkisp1_params_cfg *new_params;
> > + struct rkisp1_buffer *cur_buf;
> >
> > spin_lock(¶ms->config_lock);
> > - rkisp1_params_apply_params_cfg(params, frame_sequence);
> >
> > + if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
> > + goto unlock;
> > +
> > + rkisp1_isp_isr_other_config(params, new_params);
> > + rkisp1_isp_isr_lsc_config(params, new_params);
> > + rkisp1_isp_isr_meas_config(params, new_params);
> > +
> > + /* update shadow register immediately */
> > + rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
> > + RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
> > +
> > + /*
> > + * This isr is called when the ISR finishes processing a frame
> > + * (RKISP1_CIF_ISP_FRAME). Configurations performed here will be
> > + * applied on the next frame. Since frame_sequence is updated on the
> > + * vertical sync signal, we should use frame_sequence + 1 here to
> > + * indicate to userspace on which frame these parameters are being
> > + * applied.
> > + */
> > + rkisp1_params_complete_buffer(params, cur_buf,
> > + rkisp1->isp.frame_sequence + 1);
> > +
> > +unlock:
> > spin_unlock(¶ms->config_lock);
> > }
> >
> > @@ -1573,9 +1597,18 @@ static const struct rkisp1_cif_isp_afc_config rkisp1_afc_params_default_config =
> > 14
> > };
> >
> > -static void rkisp1_params_config_parameter(struct rkisp1_params *params)
> > +void rkisp1_params_pre_configure(struct rkisp1_params *params,
> > + enum rkisp1_fmt_raw_pat_type bayer_pat,
> > + enum v4l2_quantization quantization,
> > + enum v4l2_ycbcr_encoding ycbcr_encoding)
> > {
> > struct rkisp1_cif_isp_hst_config hst = rkisp1_hst_params_default_config;
> > + struct rkisp1_params_cfg *new_params;
> > + struct rkisp1_buffer *cur_buf;
> > +
> > + params->quantization = quantization;
> > + params->ycbcr_encoding = ycbcr_encoding;
> > + params->raw_type = bayer_pat;
> >
> > params->ops->awb_meas_config(params, &rkisp1_awb_params_default_config);
> > params->ops->awb_meas_enable(params, &rkisp1_awb_params_default_config,
> > @@ -1599,20 +1632,50 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params)
> > spin_lock_irq(¶ms->config_lock);
> >
> > /* apply the first buffer if there is one already */
> > - rkisp1_params_apply_params_cfg(params, 0);
> >
> > + if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
> > + goto unlock;
> > +
> > + rkisp1_isp_isr_other_config(params, new_params);
> > + rkisp1_isp_isr_meas_config(params, new_params);
> > +
> > + /* update shadow register immediately */
> > + rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
> > + RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
> > +
> > +unlock:
> > spin_unlock_irq(¶ms->config_lock);
> > }
> >
> > -void rkisp1_params_configure(struct rkisp1_params *params,
> > - enum rkisp1_fmt_raw_pat_type bayer_pat,
> > - enum v4l2_quantization quantization,
> > - enum v4l2_ycbcr_encoding ycbcr_encoding)
> > +void rkisp1_params_post_configure(struct rkisp1_params *params)
> > {
> > - params->quantization = quantization;
> > - params->ycbcr_encoding = ycbcr_encoding;
> > - params->raw_type = bayer_pat;
> > - rkisp1_params_config_parameter(params);
> > + struct rkisp1_params_cfg *new_params;
> > + struct rkisp1_buffer *cur_buf;
> > +
> > + spin_lock_irq(¶ms->config_lock);
> > +
> > + /*
> > + * Apply LSC parameters from the first buffer (if any is already
> > + * available. This must be done after the ISP gets started in the
> > + * ISP8000Nano v18.02 (found in the i.MX8MP) as access to the LSC RAM
> > + * is gated by the ISP_CTRL.ISP_ENABLE bit. As this initialization
> > + * ordering doesn't affect other ISP versions negatively, do so
> > + * unconditionally.
> > + */
> > +
> > + if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
> > + goto unlock;
> > +
> > + rkisp1_isp_isr_lsc_config(params, new_params);
> > +
> > + /* update shadow register immediately */
> > + rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
> > + RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>
> updating the shadow regs is already done in the 'complete buffer'
I don't see that being done in rkisp1_params_complete_buffer().
> > +
> > + rkisp1_params_complete_buffer(params, cur_buf, 0);
> > +
> > +unlock:
> > + spin_unlock_irq(¶ms->config_lock);
> > }
> >
> > /*
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 5/5] media: rkisp1: Configure LSC after enabling the ISP
@ 2022-08-18 6:25 ` Laurent Pinchart
0 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-08-18 6:25 UTC (permalink / raw)
To: Dafna Hirschfeld
Cc: linux-media, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
Hi Dafna,
On Thu, Aug 18, 2022 at 06:45:46AM +0300, Dafna Hirschfeld wrote:
> On 17.08.2022 05:18, Laurent Pinchart wrote:
> > The ISP8000Nano v18.02 (found in the i.MX8MP) requires the ISP to be
> > enabled (as indicated by the ISP_CTRL.ISP_ENABLE bit) to configure the
> > lens shading table in internal RAM. The driver currently configures all
> > ISP initial parameters before enabling the ISP, which causes the LSC RAM
> > to not be initialized properly.
> >
> > To fix this, split the rkisp1_params_configure() function into a
> > rkisp1_params_pre_configure() and a rkisp1_params_post_configure(). The
> > former configures all ISP parameters but LSC, while the latter
> > configures LSC. To implement this, the rkisp1_params_apply_params_cfg()
> > function is deconstructed, with two small helpers created to deal with
> > the parameters buffers, which are then used in rkisp1_params_isr(),
> > rkisp1_params_pre_configure() and rkisp1_params_post_configure().
> >
> > While this initialization ordering is only needed for the ISP8000Nano
> > v18.02, it doesn't affect other ISP versions negatively, and can thus be
> > followed unconditionally.
> >
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > ---
> > .../platform/rockchip/rkisp1/rkisp1-common.h | 29 ++-
> > .../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
> > .../platform/rockchip/rkisp1/rkisp1-params.c | 169 ++++++++++++------
> > 3 files changed, 143 insertions(+), 64 deletions(-)
> >
> > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
> > index 1383c13e22b8..f612e1b42b91 100644
> > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
> > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
> > @@ -589,19 +589,32 @@ void rkisp1_sd_adjust_crop(struct v4l2_rect *crop,
> > */
> > const struct rkisp1_mbus_info *rkisp1_mbus_info_get_by_code(u32 mbus_code);
> >
> > -/* rkisp1_params_configure - configure the params when stream starts.
> > - * This function is called by the isp entity upon stream starts.
> > - * The function applies the initial configuration of the parameters.
> > +/*
> > + * rkisp1_params_pre_configure - Configure the params before stream start
> > *
> > - * @params: pointer to rkisp1_params.
> > + * @params: pointer to rkisp1_params
> > * @bayer_pat: the bayer pattern on the isp video sink pad
> > * @quantization: the quantization configured on the isp's src pad
> > * @ycbcr_encoding: the ycbcr_encoding configured on the isp's src pad
> > + *
> > + * This function is called by the ISP entity just before the ISP gets started.
> > + * It applies the initial ISP parameters from the first params buffer, but
> > + * skips LSC as it needs to be configured after the ISP is started.
> > */
> > -void rkisp1_params_configure(struct rkisp1_params *params,
> > - enum rkisp1_fmt_raw_pat_type bayer_pat,
> > - enum v4l2_quantization quantization,
> > - enum v4l2_ycbcr_encoding ycbcr_encoding);
> > +void rkisp1_params_pre_configure(struct rkisp1_params *params,
> > + enum rkisp1_fmt_raw_pat_type bayer_pat,
> > + enum v4l2_quantization quantization,
> > + enum v4l2_ycbcr_encoding ycbcr_encoding);
> > +
> > +/*
> > + * rkisp1_params_post_configure - Configure the params after stream start
> > + *
> > + * @params: pointer to rkisp1_params
> > + *
> > + * This function is called by the ISP entity just after the ISP gets started.
> > + * It applies the initial ISP KSC parameters from the first params buffer.
>
> What is KSC ?
An incorrect spelling of LSC :-) I'll fix it.
> > + */
> > +void rkisp1_params_post_configure(struct rkisp1_params *params);
> >
> > /* rkisp1_params_disable - disable all parameters.
> > * This function is called by the isp entity upon stream start
> > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> > index c029d2e86717..4876bf890cb2 100644
> > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> > @@ -343,9 +343,9 @@ static int rkisp1_config_isp(struct rkisp1_isp *isp,
> > src_frm = rkisp1_isp_get_pad_fmt(isp, NULL,
> > RKISP1_ISP_PAD_SOURCE_VIDEO,
> > V4L2_SUBDEV_FORMAT_ACTIVE);
> > - rkisp1_params_configure(&rkisp1->params, sink_fmt->bayer_pat,
> > - src_frm->quantization,
> > - src_frm->ycbcr_enc);
> > + rkisp1_params_pre_configure(&rkisp1->params, sink_fmt->bayer_pat,
> > + src_frm->quantization,
> > + src_frm->ycbcr_enc);
> > }
> >
> > return 0;
> > @@ -462,6 +462,9 @@ static int rkisp1_isp_start(struct rkisp1_isp *isp, struct media_pad *source)
> > RKISP1_CIF_ISP_CTRL_ISP_INFORM_ENABLE;
> > rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
> >
> > + if (isp->src_fmt->pixel_enc == V4L2_PIXEL_ENC_BAYER)
> > + rkisp1_params_post_configure(&rkisp1->params);
>
> why is post config called only in case of bayer?
Because pre_configure is also called for Bayer input only. When the
input is YUV the ISP is bypassed, and the parameters are reset instead.
> also I see that the lsc config from the isr is called without this condition.
> In addition the post config also does 'complete buffer' so maybe you do want to
> call it without the bayer condition.
When the input is YUV there isn't supposed to be any ISP params buffers
queued. I don't know what will happen if userspace queues any, maybe
something bad, but this patch doesn't affect that behaviour as far as I
can tell. Further fixes, if required, would go on top.
> > +
> > return 0;
> > }
> >
> > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> > index 421ade177b2d..a4664efdfea8 100644
> > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> > @@ -1297,22 +1297,6 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
> > RKISP1_CIF_ISP_CTRL_ISP_GAMMA_IN_ENA);
> > }
> >
> > - /* update lsc config */
> > - if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
> > - rkisp1_lsc_config(params,
> > - &new_params->others.lsc_config);
> > -
> > - if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
> > - if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
> > - rkisp1_param_set_bits(params,
> > - RKISP1_CIF_ISP_LSC_CTRL,
> > - RKISP1_CIF_ISP_LSC_CTRL_ENA);
> > - else
> > - rkisp1_param_clear_bits(params,
> > - RKISP1_CIF_ISP_LSC_CTRL,
> > - RKISP1_CIF_ISP_LSC_CTRL_ENA);
> > - }
> > -
> > /* update awb gains */
> > if (module_cfg_update & RKISP1_CIF_ISP_MODULE_AWB_GAIN)
> > params->ops->awb_gain_config(params, &new_params->others.awb_gain_config);
> > @@ -1429,6 +1413,33 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
> > }
> > }
> >
> > +static void
> > +rkisp1_isp_isr_lsc_config(struct rkisp1_params *params,
> > + const struct rkisp1_params_cfg *new_params)
> > +{
> > + unsigned int module_en_update, module_cfg_update, module_ens;
> > +
> > + module_en_update = new_params->module_en_update;
> > + module_cfg_update = new_params->module_cfg_update;
> > + module_ens = new_params->module_ens;
> > +
> > + /* update lsc config */
> > + if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
> > + rkisp1_lsc_config(params,
> > + &new_params->others.lsc_config);
> > +
> > + if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
> > + if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
> > + rkisp1_param_set_bits(params,
> > + RKISP1_CIF_ISP_LSC_CTRL,
> > + RKISP1_CIF_ISP_LSC_CTRL_ENA);
> > + else
> > + rkisp1_param_clear_bits(params,
> > + RKISP1_CIF_ISP_LSC_CTRL,
> > + RKISP1_CIF_ISP_LSC_CTRL_ENA);
> > + }
> > +}
> > +
> > static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
> > struct rkisp1_params_cfg *new_params)
> > {
> > @@ -1490,47 +1501,60 @@ static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
> > }
> > }
> >
> > -static void rkisp1_params_apply_params_cfg(struct rkisp1_params *params,
> > - unsigned int frame_sequence)
> > +static bool rkisp1_params_get_buffer(struct rkisp1_params *params,
> > + struct rkisp1_buffer **buf,
> > + struct rkisp1_params_cfg **cfg)
> > {
> > - struct rkisp1_params_cfg *new_params;
> > - struct rkisp1_buffer *cur_buf = NULL;
> > -
> > if (list_empty(¶ms->params))
> > - return;
> > + return false;
> >
> > - cur_buf = list_first_entry(¶ms->params,
> > - struct rkisp1_buffer, queue);
> > + *buf = list_first_entry(¶ms->params, struct rkisp1_buffer, queue);
> > + *cfg = vb2_plane_vaddr(&(*buf)->vb.vb2_buf, 0);
> >
> > - new_params = (struct rkisp1_params_cfg *)vb2_plane_vaddr(&cur_buf->vb.vb2_buf, 0);
> > + return true;
> > +}
> >
> > - rkisp1_isp_isr_other_config(params, new_params);
> > - rkisp1_isp_isr_meas_config(params, new_params);
> > +static void rkisp1_params_complete_buffer(struct rkisp1_params *params,
> > + struct rkisp1_buffer *buf,
> > + unsigned int frame_sequence)
> > +{
> > + list_del(&buf->queue);
> >
> > - /* update shadow register immediately */
> > - rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL, RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
> > -
> > - list_del(&cur_buf->queue);
> > -
> > - cur_buf->vb.sequence = frame_sequence;
> > - vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
> > + buf->vb.sequence = frame_sequence;
> > + vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
> > }
> >
> > void rkisp1_params_isr(struct rkisp1_device *rkisp1)
> > {
> > - /*
> > - * This isr is called when the ISR finishes processing a frame (RKISP1_CIF_ISP_FRAME).
> > - * Configurations performed here will be applied on the next frame.
> > - * Since frame_sequence is updated on the vertical sync signal, we should use
> > - * frame_sequence + 1 here to indicate to userspace on which frame these parameters
> > - * are being applied.
> > - */
> > - unsigned int frame_sequence = rkisp1->isp.frame_sequence + 1;
> > struct rkisp1_params *params = &rkisp1->params;
> > + struct rkisp1_params_cfg *new_params;
> > + struct rkisp1_buffer *cur_buf;
> >
> > spin_lock(¶ms->config_lock);
> > - rkisp1_params_apply_params_cfg(params, frame_sequence);
> >
> > + if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
> > + goto unlock;
> > +
> > + rkisp1_isp_isr_other_config(params, new_params);
> > + rkisp1_isp_isr_lsc_config(params, new_params);
> > + rkisp1_isp_isr_meas_config(params, new_params);
> > +
> > + /* update shadow register immediately */
> > + rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
> > + RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
> > +
> > + /*
> > + * This isr is called when the ISR finishes processing a frame
> > + * (RKISP1_CIF_ISP_FRAME). Configurations performed here will be
> > + * applied on the next frame. Since frame_sequence is updated on the
> > + * vertical sync signal, we should use frame_sequence + 1 here to
> > + * indicate to userspace on which frame these parameters are being
> > + * applied.
> > + */
> > + rkisp1_params_complete_buffer(params, cur_buf,
> > + rkisp1->isp.frame_sequence + 1);
> > +
> > +unlock:
> > spin_unlock(¶ms->config_lock);
> > }
> >
> > @@ -1573,9 +1597,18 @@ static const struct rkisp1_cif_isp_afc_config rkisp1_afc_params_default_config =
> > 14
> > };
> >
> > -static void rkisp1_params_config_parameter(struct rkisp1_params *params)
> > +void rkisp1_params_pre_configure(struct rkisp1_params *params,
> > + enum rkisp1_fmt_raw_pat_type bayer_pat,
> > + enum v4l2_quantization quantization,
> > + enum v4l2_ycbcr_encoding ycbcr_encoding)
> > {
> > struct rkisp1_cif_isp_hst_config hst = rkisp1_hst_params_default_config;
> > + struct rkisp1_params_cfg *new_params;
> > + struct rkisp1_buffer *cur_buf;
> > +
> > + params->quantization = quantization;
> > + params->ycbcr_encoding = ycbcr_encoding;
> > + params->raw_type = bayer_pat;
> >
> > params->ops->awb_meas_config(params, &rkisp1_awb_params_default_config);
> > params->ops->awb_meas_enable(params, &rkisp1_awb_params_default_config,
> > @@ -1599,20 +1632,50 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params)
> > spin_lock_irq(¶ms->config_lock);
> >
> > /* apply the first buffer if there is one already */
> > - rkisp1_params_apply_params_cfg(params, 0);
> >
> > + if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
> > + goto unlock;
> > +
> > + rkisp1_isp_isr_other_config(params, new_params);
> > + rkisp1_isp_isr_meas_config(params, new_params);
> > +
> > + /* update shadow register immediately */
> > + rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
> > + RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
> > +
> > +unlock:
> > spin_unlock_irq(¶ms->config_lock);
> > }
> >
> > -void rkisp1_params_configure(struct rkisp1_params *params,
> > - enum rkisp1_fmt_raw_pat_type bayer_pat,
> > - enum v4l2_quantization quantization,
> > - enum v4l2_ycbcr_encoding ycbcr_encoding)
> > +void rkisp1_params_post_configure(struct rkisp1_params *params)
> > {
> > - params->quantization = quantization;
> > - params->ycbcr_encoding = ycbcr_encoding;
> > - params->raw_type = bayer_pat;
> > - rkisp1_params_config_parameter(params);
> > + struct rkisp1_params_cfg *new_params;
> > + struct rkisp1_buffer *cur_buf;
> > +
> > + spin_lock_irq(¶ms->config_lock);
> > +
> > + /*
> > + * Apply LSC parameters from the first buffer (if any is already
> > + * available. This must be done after the ISP gets started in the
> > + * ISP8000Nano v18.02 (found in the i.MX8MP) as access to the LSC RAM
> > + * is gated by the ISP_CTRL.ISP_ENABLE bit. As this initialization
> > + * ordering doesn't affect other ISP versions negatively, do so
> > + * unconditionally.
> > + */
> > +
> > + if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
> > + goto unlock;
> > +
> > + rkisp1_isp_isr_lsc_config(params, new_params);
> > +
> > + /* update shadow register immediately */
> > + rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
> > + RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>
> updating the shadow regs is already done in the 'complete buffer'
I don't see that being done in rkisp1_params_complete_buffer().
> > +
> > + rkisp1_params_complete_buffer(params, cur_buf, 0);
> > +
> > +unlock:
> > + spin_unlock_irq(¶ms->config_lock);
> > }
> >
> > /*
--
Regards,
Laurent Pinchart
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 5/5] media: rkisp1: Configure LSC after enabling the ISP
2022-08-18 6:25 ` Laurent Pinchart
@ 2022-08-22 17:08 ` Dafna Hirschfeld
-1 siblings, 0 replies; 46+ messages in thread
From: Dafna Hirschfeld @ 2022-08-22 17:08 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
On 18.08.2022 09:25, Laurent Pinchart wrote:
>Hi Dafna,
>
>On Thu, Aug 18, 2022 at 06:45:46AM +0300, Dafna Hirschfeld wrote:
>> On 17.08.2022 05:18, Laurent Pinchart wrote:
>> > The ISP8000Nano v18.02 (found in the i.MX8MP) requires the ISP to be
>> > enabled (as indicated by the ISP_CTRL.ISP_ENABLE bit) to configure the
>> > lens shading table in internal RAM. The driver currently configures all
>> > ISP initial parameters before enabling the ISP, which causes the LSC RAM
>> > to not be initialized properly.
>> >
>> > To fix this, split the rkisp1_params_configure() function into a
>> > rkisp1_params_pre_configure() and a rkisp1_params_post_configure(). The
>> > former configures all ISP parameters but LSC, while the latter
>> > configures LSC. To implement this, the rkisp1_params_apply_params_cfg()
>> > function is deconstructed, with two small helpers created to deal with
>> > the parameters buffers, which are then used in rkisp1_params_isr(),
>> > rkisp1_params_pre_configure() and rkisp1_params_post_configure().
>> >
>> > While this initialization ordering is only needed for the ISP8000Nano
>> > v18.02, it doesn't affect other ISP versions negatively, and can thus be
>> > followed unconditionally.
>> >
>> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>> > ---
>> > .../platform/rockchip/rkisp1/rkisp1-common.h | 29 ++-
>> > .../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
>> > .../platform/rockchip/rkisp1/rkisp1-params.c | 169 ++++++++++++------
>> > 3 files changed, 143 insertions(+), 64 deletions(-)
>> >
>> > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>> > index 1383c13e22b8..f612e1b42b91 100644
>> > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>> > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>> > @@ -589,19 +589,32 @@ void rkisp1_sd_adjust_crop(struct v4l2_rect *crop,
>> > */
>> > const struct rkisp1_mbus_info *rkisp1_mbus_info_get_by_code(u32 mbus_code);
>> >
>> > -/* rkisp1_params_configure - configure the params when stream starts.
>> > - * This function is called by the isp entity upon stream starts.
>> > - * The function applies the initial configuration of the parameters.
>> > +/*
>> > + * rkisp1_params_pre_configure - Configure the params before stream start
>> > *
>> > - * @params: pointer to rkisp1_params.
>> > + * @params: pointer to rkisp1_params
>> > * @bayer_pat: the bayer pattern on the isp video sink pad
>> > * @quantization: the quantization configured on the isp's src pad
>> > * @ycbcr_encoding: the ycbcr_encoding configured on the isp's src pad
>> > + *
>> > + * This function is called by the ISP entity just before the ISP gets started.
>> > + * It applies the initial ISP parameters from the first params buffer, but
>> > + * skips LSC as it needs to be configured after the ISP is started.
>> > */
>> > -void rkisp1_params_configure(struct rkisp1_params *params,
>> > - enum rkisp1_fmt_raw_pat_type bayer_pat,
>> > - enum v4l2_quantization quantization,
>> > - enum v4l2_ycbcr_encoding ycbcr_encoding);
>> > +void rkisp1_params_pre_configure(struct rkisp1_params *params,
>> > + enum rkisp1_fmt_raw_pat_type bayer_pat,
>> > + enum v4l2_quantization quantization,
>> > + enum v4l2_ycbcr_encoding ycbcr_encoding);
>> > +
>> > +/*
>> > + * rkisp1_params_post_configure - Configure the params after stream start
>> > + *
>> > + * @params: pointer to rkisp1_params
>> > + *
>> > + * This function is called by the ISP entity just after the ISP gets started.
>> > + * It applies the initial ISP KSC parameters from the first params buffer.
>>
>> What is KSC ?
>
>An incorrect spelling of LSC :-) I'll fix it.
>
>> > + */
>> > +void rkisp1_params_post_configure(struct rkisp1_params *params);
>> >
>> > /* rkisp1_params_disable - disable all parameters.
>> > * This function is called by the isp entity upon stream start
>> > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>> > index c029d2e86717..4876bf890cb2 100644
>> > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>> > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>> > @@ -343,9 +343,9 @@ static int rkisp1_config_isp(struct rkisp1_isp *isp,
>> > src_frm = rkisp1_isp_get_pad_fmt(isp, NULL,
>> > RKISP1_ISP_PAD_SOURCE_VIDEO,
>> > V4L2_SUBDEV_FORMAT_ACTIVE);
>> > - rkisp1_params_configure(&rkisp1->params, sink_fmt->bayer_pat,
>> > - src_frm->quantization,
>> > - src_frm->ycbcr_enc);
>> > + rkisp1_params_pre_configure(&rkisp1->params, sink_fmt->bayer_pat,
>> > + src_frm->quantization,
>> > + src_frm->ycbcr_enc);
>> > }
>> >
>> > return 0;
>> > @@ -462,6 +462,9 @@ static int rkisp1_isp_start(struct rkisp1_isp *isp, struct media_pad *source)
>> > RKISP1_CIF_ISP_CTRL_ISP_INFORM_ENABLE;
>> > rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
>> >
>> > + if (isp->src_fmt->pixel_enc == V4L2_PIXEL_ENC_BAYER)
>> > + rkisp1_params_post_configure(&rkisp1->params);
>>
>> why is post config called only in case of bayer?
>
>Because pre_configure is also called for Bayer input only. When the
>input is YUV the ISP is bypassed, and the parameters are reset instead.
>
>> also I see that the lsc config from the isr is called without this condition.
>> In addition the post config also does 'complete buffer' so maybe you do want to
>> call it without the bayer condition.
>
>When the input is YUV there isn't supposed to be any ISP params buffers
>queued. I don't know what will happen if userspace queues any, maybe
>something bad, but this patch doesn't affect that behaviour as far as I
>can tell. Further fixes, if required, would go on top.
>
>> > +
>> > return 0;
>> > }
>> >
>> > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>> > index 421ade177b2d..a4664efdfea8 100644
>> > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>> > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>> > @@ -1297,22 +1297,6 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
>> > RKISP1_CIF_ISP_CTRL_ISP_GAMMA_IN_ENA);
>> > }
>> >
>> > - /* update lsc config */
>> > - if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
>> > - rkisp1_lsc_config(params,
>> > - &new_params->others.lsc_config);
>> > -
>> > - if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
>> > - if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
>> > - rkisp1_param_set_bits(params,
>> > - RKISP1_CIF_ISP_LSC_CTRL,
>> > - RKISP1_CIF_ISP_LSC_CTRL_ENA);
>> > - else
>> > - rkisp1_param_clear_bits(params,
>> > - RKISP1_CIF_ISP_LSC_CTRL,
>> > - RKISP1_CIF_ISP_LSC_CTRL_ENA);
>> > - }
>> > -
>> > /* update awb gains */
>> > if (module_cfg_update & RKISP1_CIF_ISP_MODULE_AWB_GAIN)
>> > params->ops->awb_gain_config(params, &new_params->others.awb_gain_config);
>> > @@ -1429,6 +1413,33 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
>> > }
>> > }
>> >
>> > +static void
>> > +rkisp1_isp_isr_lsc_config(struct rkisp1_params *params,
>> > + const struct rkisp1_params_cfg *new_params)
>> > +{
>> > + unsigned int module_en_update, module_cfg_update, module_ens;
>> > +
>> > + module_en_update = new_params->module_en_update;
>> > + module_cfg_update = new_params->module_cfg_update;
>> > + module_ens = new_params->module_ens;
>> > +
>> > + /* update lsc config */
>> > + if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
>> > + rkisp1_lsc_config(params,
>> > + &new_params->others.lsc_config);
>> > +
>> > + if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
>> > + if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
>> > + rkisp1_param_set_bits(params,
>> > + RKISP1_CIF_ISP_LSC_CTRL,
>> > + RKISP1_CIF_ISP_LSC_CTRL_ENA);
>> > + else
>> > + rkisp1_param_clear_bits(params,
>> > + RKISP1_CIF_ISP_LSC_CTRL,
>> > + RKISP1_CIF_ISP_LSC_CTRL_ENA);
>> > + }
>> > +}
>> > +
>> > static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
>> > struct rkisp1_params_cfg *new_params)
>> > {
>> > @@ -1490,47 +1501,60 @@ static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
>> > }
>> > }
>> >
>> > -static void rkisp1_params_apply_params_cfg(struct rkisp1_params *params,
>> > - unsigned int frame_sequence)
>> > +static bool rkisp1_params_get_buffer(struct rkisp1_params *params,
>> > + struct rkisp1_buffer **buf,
>> > + struct rkisp1_params_cfg **cfg)
>> > {
>> > - struct rkisp1_params_cfg *new_params;
>> > - struct rkisp1_buffer *cur_buf = NULL;
>> > -
>> > if (list_empty(¶ms->params))
>> > - return;
>> > + return false;
>> >
>> > - cur_buf = list_first_entry(¶ms->params,
>> > - struct rkisp1_buffer, queue);
>> > + *buf = list_first_entry(¶ms->params, struct rkisp1_buffer, queue);
>> > + *cfg = vb2_plane_vaddr(&(*buf)->vb.vb2_buf, 0);
>> >
>> > - new_params = (struct rkisp1_params_cfg *)vb2_plane_vaddr(&cur_buf->vb.vb2_buf, 0);
>> > + return true;
>> > +}
>> >
>> > - rkisp1_isp_isr_other_config(params, new_params);
>> > - rkisp1_isp_isr_meas_config(params, new_params);
>> > +static void rkisp1_params_complete_buffer(struct rkisp1_params *params,
>> > + struct rkisp1_buffer *buf,
>> > + unsigned int frame_sequence)
>> > +{
>> > + list_del(&buf->queue);
>> >
>> > - /* update shadow register immediately */
>> > - rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL, RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>> > -
>> > - list_del(&cur_buf->queue);
>> > -
>> > - cur_buf->vb.sequence = frame_sequence;
>> > - vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
>> > + buf->vb.sequence = frame_sequence;
>> > + vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
>> > }
>> >
>> > void rkisp1_params_isr(struct rkisp1_device *rkisp1)
>> > {
>> > - /*
>> > - * This isr is called when the ISR finishes processing a frame (RKISP1_CIF_ISP_FRAME).
>> > - * Configurations performed here will be applied on the next frame.
>> > - * Since frame_sequence is updated on the vertical sync signal, we should use
>> > - * frame_sequence + 1 here to indicate to userspace on which frame these parameters
>> > - * are being applied.
>> > - */
>> > - unsigned int frame_sequence = rkisp1->isp.frame_sequence + 1;
>> > struct rkisp1_params *params = &rkisp1->params;
>> > + struct rkisp1_params_cfg *new_params;
>> > + struct rkisp1_buffer *cur_buf;
>> >
>> > spin_lock(¶ms->config_lock);
>> > - rkisp1_params_apply_params_cfg(params, frame_sequence);
>> >
>> > + if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>> > + goto unlock;
>> > +
>> > + rkisp1_isp_isr_other_config(params, new_params);
>> > + rkisp1_isp_isr_lsc_config(params, new_params);
>> > + rkisp1_isp_isr_meas_config(params, new_params);
>> > +
>> > + /* update shadow register immediately */
>> > + rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>> > + RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>> > +
>> > + /*
>> > + * This isr is called when the ISR finishes processing a frame
>> > + * (RKISP1_CIF_ISP_FRAME). Configurations performed here will be
>> > + * applied on the next frame. Since frame_sequence is updated on the
>> > + * vertical sync signal, we should use frame_sequence + 1 here to
>> > + * indicate to userspace on which frame these parameters are being
>> > + * applied.
>> > + */
>> > + rkisp1_params_complete_buffer(params, cur_buf,
>> > + rkisp1->isp.frame_sequence + 1);
>> > +
>> > +unlock:
>> > spin_unlock(¶ms->config_lock);
>> > }
>> >
>> > @@ -1573,9 +1597,18 @@ static const struct rkisp1_cif_isp_afc_config rkisp1_afc_params_default_config =
>> > 14
>> > };
>> >
>> > -static void rkisp1_params_config_parameter(struct rkisp1_params *params)
>> > +void rkisp1_params_pre_configure(struct rkisp1_params *params,
>> > + enum rkisp1_fmt_raw_pat_type bayer_pat,
>> > + enum v4l2_quantization quantization,
>> > + enum v4l2_ycbcr_encoding ycbcr_encoding)
>> > {
>> > struct rkisp1_cif_isp_hst_config hst = rkisp1_hst_params_default_config;
>> > + struct rkisp1_params_cfg *new_params;
>> > + struct rkisp1_buffer *cur_buf;
>> > +
>> > + params->quantization = quantization;
>> > + params->ycbcr_encoding = ycbcr_encoding;
>> > + params->raw_type = bayer_pat;
>> >
>> > params->ops->awb_meas_config(params, &rkisp1_awb_params_default_config);
>> > params->ops->awb_meas_enable(params, &rkisp1_awb_params_default_config,
>> > @@ -1599,20 +1632,50 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params)
>> > spin_lock_irq(¶ms->config_lock);
>> >
>> > /* apply the first buffer if there is one already */
>> > - rkisp1_params_apply_params_cfg(params, 0);
>> >
>> > + if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>> > + goto unlock;
>> > +
>> > + rkisp1_isp_isr_other_config(params, new_params);
>> > + rkisp1_isp_isr_meas_config(params, new_params);
>> > +
>> > + /* update shadow register immediately */
>> > + rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>> > + RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>> > +
>> > +unlock:
>> > spin_unlock_irq(¶ms->config_lock);
>> > }
>> >
>> > -void rkisp1_params_configure(struct rkisp1_params *params,
>> > - enum rkisp1_fmt_raw_pat_type bayer_pat,
>> > - enum v4l2_quantization quantization,
>> > - enum v4l2_ycbcr_encoding ycbcr_encoding)
>> > +void rkisp1_params_post_configure(struct rkisp1_params *params)
>> > {
>> > - params->quantization = quantization;
>> > - params->ycbcr_encoding = ycbcr_encoding;
>> > - params->raw_type = bayer_pat;
>> > - rkisp1_params_config_parameter(params);
>> > + struct rkisp1_params_cfg *new_params;
>> > + struct rkisp1_buffer *cur_buf;
>> > +
>> > + spin_lock_irq(¶ms->config_lock);
>> > +
>> > + /*
>> > + * Apply LSC parameters from the first buffer (if any is already
>> > + * available. This must be done after the ISP gets started in the
>> > + * ISP8000Nano v18.02 (found in the i.MX8MP) as access to the LSC RAM
>> > + * is gated by the ISP_CTRL.ISP_ENABLE bit. As this initialization
>> > + * ordering doesn't affect other ISP versions negatively, do so
>> > + * unconditionally.
>> > + */
>> > +
>> > + if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>> > + goto unlock;
>> > +
>> > + rkisp1_isp_isr_lsc_config(params, new_params);
>> > +
>> > + /* update shadow register immediately */
>> > + rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>> > + RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>>
>> updating the shadow regs is already done in the 'complete buffer'
>
>I don't see that being done in rkisp1_params_complete_buffer().
Sorry, I missed,
Dafna,
>
>> > +
>> > + rkisp1_params_complete_buffer(params, cur_buf, 0);
>> > +
>> > +unlock:
>> > + spin_unlock_irq(¶ms->config_lock);
>> > }
>> >
>> > /*
>
>--
>Regards,
>
>Laurent Pinchart
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 5/5] media: rkisp1: Configure LSC after enabling the ISP
@ 2022-08-22 17:08 ` Dafna Hirschfeld
0 siblings, 0 replies; 46+ messages in thread
From: Dafna Hirschfeld @ 2022-08-22 17:08 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
On 18.08.2022 09:25, Laurent Pinchart wrote:
>Hi Dafna,
>
>On Thu, Aug 18, 2022 at 06:45:46AM +0300, Dafna Hirschfeld wrote:
>> On 17.08.2022 05:18, Laurent Pinchart wrote:
>> > The ISP8000Nano v18.02 (found in the i.MX8MP) requires the ISP to be
>> > enabled (as indicated by the ISP_CTRL.ISP_ENABLE bit) to configure the
>> > lens shading table in internal RAM. The driver currently configures all
>> > ISP initial parameters before enabling the ISP, which causes the LSC RAM
>> > to not be initialized properly.
>> >
>> > To fix this, split the rkisp1_params_configure() function into a
>> > rkisp1_params_pre_configure() and a rkisp1_params_post_configure(). The
>> > former configures all ISP parameters but LSC, while the latter
>> > configures LSC. To implement this, the rkisp1_params_apply_params_cfg()
>> > function is deconstructed, with two small helpers created to deal with
>> > the parameters buffers, which are then used in rkisp1_params_isr(),
>> > rkisp1_params_pre_configure() and rkisp1_params_post_configure().
>> >
>> > While this initialization ordering is only needed for the ISP8000Nano
>> > v18.02, it doesn't affect other ISP versions negatively, and can thus be
>> > followed unconditionally.
>> >
>> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>> > ---
>> > .../platform/rockchip/rkisp1/rkisp1-common.h | 29 ++-
>> > .../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
>> > .../platform/rockchip/rkisp1/rkisp1-params.c | 169 ++++++++++++------
>> > 3 files changed, 143 insertions(+), 64 deletions(-)
>> >
>> > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>> > index 1383c13e22b8..f612e1b42b91 100644
>> > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>> > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>> > @@ -589,19 +589,32 @@ void rkisp1_sd_adjust_crop(struct v4l2_rect *crop,
>> > */
>> > const struct rkisp1_mbus_info *rkisp1_mbus_info_get_by_code(u32 mbus_code);
>> >
>> > -/* rkisp1_params_configure - configure the params when stream starts.
>> > - * This function is called by the isp entity upon stream starts.
>> > - * The function applies the initial configuration of the parameters.
>> > +/*
>> > + * rkisp1_params_pre_configure - Configure the params before stream start
>> > *
>> > - * @params: pointer to rkisp1_params.
>> > + * @params: pointer to rkisp1_params
>> > * @bayer_pat: the bayer pattern on the isp video sink pad
>> > * @quantization: the quantization configured on the isp's src pad
>> > * @ycbcr_encoding: the ycbcr_encoding configured on the isp's src pad
>> > + *
>> > + * This function is called by the ISP entity just before the ISP gets started.
>> > + * It applies the initial ISP parameters from the first params buffer, but
>> > + * skips LSC as it needs to be configured after the ISP is started.
>> > */
>> > -void rkisp1_params_configure(struct rkisp1_params *params,
>> > - enum rkisp1_fmt_raw_pat_type bayer_pat,
>> > - enum v4l2_quantization quantization,
>> > - enum v4l2_ycbcr_encoding ycbcr_encoding);
>> > +void rkisp1_params_pre_configure(struct rkisp1_params *params,
>> > + enum rkisp1_fmt_raw_pat_type bayer_pat,
>> > + enum v4l2_quantization quantization,
>> > + enum v4l2_ycbcr_encoding ycbcr_encoding);
>> > +
>> > +/*
>> > + * rkisp1_params_post_configure - Configure the params after stream start
>> > + *
>> > + * @params: pointer to rkisp1_params
>> > + *
>> > + * This function is called by the ISP entity just after the ISP gets started.
>> > + * It applies the initial ISP KSC parameters from the first params buffer.
>>
>> What is KSC ?
>
>An incorrect spelling of LSC :-) I'll fix it.
>
>> > + */
>> > +void rkisp1_params_post_configure(struct rkisp1_params *params);
>> >
>> > /* rkisp1_params_disable - disable all parameters.
>> > * This function is called by the isp entity upon stream start
>> > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>> > index c029d2e86717..4876bf890cb2 100644
>> > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>> > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>> > @@ -343,9 +343,9 @@ static int rkisp1_config_isp(struct rkisp1_isp *isp,
>> > src_frm = rkisp1_isp_get_pad_fmt(isp, NULL,
>> > RKISP1_ISP_PAD_SOURCE_VIDEO,
>> > V4L2_SUBDEV_FORMAT_ACTIVE);
>> > - rkisp1_params_configure(&rkisp1->params, sink_fmt->bayer_pat,
>> > - src_frm->quantization,
>> > - src_frm->ycbcr_enc);
>> > + rkisp1_params_pre_configure(&rkisp1->params, sink_fmt->bayer_pat,
>> > + src_frm->quantization,
>> > + src_frm->ycbcr_enc);
>> > }
>> >
>> > return 0;
>> > @@ -462,6 +462,9 @@ static int rkisp1_isp_start(struct rkisp1_isp *isp, struct media_pad *source)
>> > RKISP1_CIF_ISP_CTRL_ISP_INFORM_ENABLE;
>> > rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
>> >
>> > + if (isp->src_fmt->pixel_enc == V4L2_PIXEL_ENC_BAYER)
>> > + rkisp1_params_post_configure(&rkisp1->params);
>>
>> why is post config called only in case of bayer?
>
>Because pre_configure is also called for Bayer input only. When the
>input is YUV the ISP is bypassed, and the parameters are reset instead.
>
>> also I see that the lsc config from the isr is called without this condition.
>> In addition the post config also does 'complete buffer' so maybe you do want to
>> call it without the bayer condition.
>
>When the input is YUV there isn't supposed to be any ISP params buffers
>queued. I don't know what will happen if userspace queues any, maybe
>something bad, but this patch doesn't affect that behaviour as far as I
>can tell. Further fixes, if required, would go on top.
>
>> > +
>> > return 0;
>> > }
>> >
>> > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>> > index 421ade177b2d..a4664efdfea8 100644
>> > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>> > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>> > @@ -1297,22 +1297,6 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
>> > RKISP1_CIF_ISP_CTRL_ISP_GAMMA_IN_ENA);
>> > }
>> >
>> > - /* update lsc config */
>> > - if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
>> > - rkisp1_lsc_config(params,
>> > - &new_params->others.lsc_config);
>> > -
>> > - if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
>> > - if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
>> > - rkisp1_param_set_bits(params,
>> > - RKISP1_CIF_ISP_LSC_CTRL,
>> > - RKISP1_CIF_ISP_LSC_CTRL_ENA);
>> > - else
>> > - rkisp1_param_clear_bits(params,
>> > - RKISP1_CIF_ISP_LSC_CTRL,
>> > - RKISP1_CIF_ISP_LSC_CTRL_ENA);
>> > - }
>> > -
>> > /* update awb gains */
>> > if (module_cfg_update & RKISP1_CIF_ISP_MODULE_AWB_GAIN)
>> > params->ops->awb_gain_config(params, &new_params->others.awb_gain_config);
>> > @@ -1429,6 +1413,33 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
>> > }
>> > }
>> >
>> > +static void
>> > +rkisp1_isp_isr_lsc_config(struct rkisp1_params *params,
>> > + const struct rkisp1_params_cfg *new_params)
>> > +{
>> > + unsigned int module_en_update, module_cfg_update, module_ens;
>> > +
>> > + module_en_update = new_params->module_en_update;
>> > + module_cfg_update = new_params->module_cfg_update;
>> > + module_ens = new_params->module_ens;
>> > +
>> > + /* update lsc config */
>> > + if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
>> > + rkisp1_lsc_config(params,
>> > + &new_params->others.lsc_config);
>> > +
>> > + if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
>> > + if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
>> > + rkisp1_param_set_bits(params,
>> > + RKISP1_CIF_ISP_LSC_CTRL,
>> > + RKISP1_CIF_ISP_LSC_CTRL_ENA);
>> > + else
>> > + rkisp1_param_clear_bits(params,
>> > + RKISP1_CIF_ISP_LSC_CTRL,
>> > + RKISP1_CIF_ISP_LSC_CTRL_ENA);
>> > + }
>> > +}
>> > +
>> > static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
>> > struct rkisp1_params_cfg *new_params)
>> > {
>> > @@ -1490,47 +1501,60 @@ static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
>> > }
>> > }
>> >
>> > -static void rkisp1_params_apply_params_cfg(struct rkisp1_params *params,
>> > - unsigned int frame_sequence)
>> > +static bool rkisp1_params_get_buffer(struct rkisp1_params *params,
>> > + struct rkisp1_buffer **buf,
>> > + struct rkisp1_params_cfg **cfg)
>> > {
>> > - struct rkisp1_params_cfg *new_params;
>> > - struct rkisp1_buffer *cur_buf = NULL;
>> > -
>> > if (list_empty(¶ms->params))
>> > - return;
>> > + return false;
>> >
>> > - cur_buf = list_first_entry(¶ms->params,
>> > - struct rkisp1_buffer, queue);
>> > + *buf = list_first_entry(¶ms->params, struct rkisp1_buffer, queue);
>> > + *cfg = vb2_plane_vaddr(&(*buf)->vb.vb2_buf, 0);
>> >
>> > - new_params = (struct rkisp1_params_cfg *)vb2_plane_vaddr(&cur_buf->vb.vb2_buf, 0);
>> > + return true;
>> > +}
>> >
>> > - rkisp1_isp_isr_other_config(params, new_params);
>> > - rkisp1_isp_isr_meas_config(params, new_params);
>> > +static void rkisp1_params_complete_buffer(struct rkisp1_params *params,
>> > + struct rkisp1_buffer *buf,
>> > + unsigned int frame_sequence)
>> > +{
>> > + list_del(&buf->queue);
>> >
>> > - /* update shadow register immediately */
>> > - rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL, RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>> > -
>> > - list_del(&cur_buf->queue);
>> > -
>> > - cur_buf->vb.sequence = frame_sequence;
>> > - vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
>> > + buf->vb.sequence = frame_sequence;
>> > + vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
>> > }
>> >
>> > void rkisp1_params_isr(struct rkisp1_device *rkisp1)
>> > {
>> > - /*
>> > - * This isr is called when the ISR finishes processing a frame (RKISP1_CIF_ISP_FRAME).
>> > - * Configurations performed here will be applied on the next frame.
>> > - * Since frame_sequence is updated on the vertical sync signal, we should use
>> > - * frame_sequence + 1 here to indicate to userspace on which frame these parameters
>> > - * are being applied.
>> > - */
>> > - unsigned int frame_sequence = rkisp1->isp.frame_sequence + 1;
>> > struct rkisp1_params *params = &rkisp1->params;
>> > + struct rkisp1_params_cfg *new_params;
>> > + struct rkisp1_buffer *cur_buf;
>> >
>> > spin_lock(¶ms->config_lock);
>> > - rkisp1_params_apply_params_cfg(params, frame_sequence);
>> >
>> > + if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>> > + goto unlock;
>> > +
>> > + rkisp1_isp_isr_other_config(params, new_params);
>> > + rkisp1_isp_isr_lsc_config(params, new_params);
>> > + rkisp1_isp_isr_meas_config(params, new_params);
>> > +
>> > + /* update shadow register immediately */
>> > + rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>> > + RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>> > +
>> > + /*
>> > + * This isr is called when the ISR finishes processing a frame
>> > + * (RKISP1_CIF_ISP_FRAME). Configurations performed here will be
>> > + * applied on the next frame. Since frame_sequence is updated on the
>> > + * vertical sync signal, we should use frame_sequence + 1 here to
>> > + * indicate to userspace on which frame these parameters are being
>> > + * applied.
>> > + */
>> > + rkisp1_params_complete_buffer(params, cur_buf,
>> > + rkisp1->isp.frame_sequence + 1);
>> > +
>> > +unlock:
>> > spin_unlock(¶ms->config_lock);
>> > }
>> >
>> > @@ -1573,9 +1597,18 @@ static const struct rkisp1_cif_isp_afc_config rkisp1_afc_params_default_config =
>> > 14
>> > };
>> >
>> > -static void rkisp1_params_config_parameter(struct rkisp1_params *params)
>> > +void rkisp1_params_pre_configure(struct rkisp1_params *params,
>> > + enum rkisp1_fmt_raw_pat_type bayer_pat,
>> > + enum v4l2_quantization quantization,
>> > + enum v4l2_ycbcr_encoding ycbcr_encoding)
>> > {
>> > struct rkisp1_cif_isp_hst_config hst = rkisp1_hst_params_default_config;
>> > + struct rkisp1_params_cfg *new_params;
>> > + struct rkisp1_buffer *cur_buf;
>> > +
>> > + params->quantization = quantization;
>> > + params->ycbcr_encoding = ycbcr_encoding;
>> > + params->raw_type = bayer_pat;
>> >
>> > params->ops->awb_meas_config(params, &rkisp1_awb_params_default_config);
>> > params->ops->awb_meas_enable(params, &rkisp1_awb_params_default_config,
>> > @@ -1599,20 +1632,50 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params)
>> > spin_lock_irq(¶ms->config_lock);
>> >
>> > /* apply the first buffer if there is one already */
>> > - rkisp1_params_apply_params_cfg(params, 0);
>> >
>> > + if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>> > + goto unlock;
>> > +
>> > + rkisp1_isp_isr_other_config(params, new_params);
>> > + rkisp1_isp_isr_meas_config(params, new_params);
>> > +
>> > + /* update shadow register immediately */
>> > + rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>> > + RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>> > +
>> > +unlock:
>> > spin_unlock_irq(¶ms->config_lock);
>> > }
>> >
>> > -void rkisp1_params_configure(struct rkisp1_params *params,
>> > - enum rkisp1_fmt_raw_pat_type bayer_pat,
>> > - enum v4l2_quantization quantization,
>> > - enum v4l2_ycbcr_encoding ycbcr_encoding)
>> > +void rkisp1_params_post_configure(struct rkisp1_params *params)
>> > {
>> > - params->quantization = quantization;
>> > - params->ycbcr_encoding = ycbcr_encoding;
>> > - params->raw_type = bayer_pat;
>> > - rkisp1_params_config_parameter(params);
>> > + struct rkisp1_params_cfg *new_params;
>> > + struct rkisp1_buffer *cur_buf;
>> > +
>> > + spin_lock_irq(¶ms->config_lock);
>> > +
>> > + /*
>> > + * Apply LSC parameters from the first buffer (if any is already
>> > + * available. This must be done after the ISP gets started in the
>> > + * ISP8000Nano v18.02 (found in the i.MX8MP) as access to the LSC RAM
>> > + * is gated by the ISP_CTRL.ISP_ENABLE bit. As this initialization
>> > + * ordering doesn't affect other ISP versions negatively, do so
>> > + * unconditionally.
>> > + */
>> > +
>> > + if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>> > + goto unlock;
>> > +
>> > + rkisp1_isp_isr_lsc_config(params, new_params);
>> > +
>> > + /* update shadow register immediately */
>> > + rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>> > + RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>>
>> updating the shadow regs is already done in the 'complete buffer'
>
>I don't see that being done in rkisp1_params_complete_buffer().
Sorry, I missed,
Dafna,
>
>> > +
>> > + rkisp1_params_complete_buffer(params, cur_buf, 0);
>> > +
>> > +unlock:
>> > + spin_unlock_irq(¶ms->config_lock);
>> > }
>> >
>> > /*
>
>--
>Regards,
>
>Laurent Pinchart
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH v1.1 4/5] media: rkisp1: Use correct macro for gradient registers
2022-08-17 2:18 ` Laurent Pinchart
@ 2022-08-23 17:21 ` Laurent Pinchart
-1 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-08-23 17:21 UTC (permalink / raw)
To: linux-media
Cc: linux-rockchip, Dafna Hirschfeld, Heiko Stuebner,
Florian Sylvestre, Paul Elder
The rkisp1_lsc_config() function incorrectly uses the
RKISP1_CIF_ISP_LSC_SECT_SIZE() macro for the gradient registers. Replace
it with the correct macro, and rename it from
RKISP1_CIF_ISP_LSC_GRAD_SIZE() to RKISP1_CIF_ISP_LSC_SECT_GRAD() as the
corresponding registers store the gradients for each sector, not a size.
This doesn't cause any functional change as the two macros are defined
identically (the size and gradient registers store fields in the same
number of bits at the same positions).
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
Changes since v1:
- Rename RKISP1_CIF_ISP_LSC_GRAD_SIZE to RKISP1_CIF_ISP_LSC_SECT_GRAD
---
drivers/media/platform/rockchip/rkisp1/rkisp1-params.c | 4 ++--
drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
index aa6efa4c6e9e..123c26fc1679 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
@@ -334,7 +334,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE(i), data);
/* program x grad tables */
- data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2],
+ data = RKISP1_CIF_ISP_LSC_SECT_GRAD(arg->x_grad_tbl[i * 2],
arg->x_grad_tbl[i * 2 + 1]);
rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD(i), data);
@@ -344,7 +344,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE(i), data);
/* program y grad tables */
- data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2],
+ data = RKISP1_CIF_ISP_LSC_SECT_GRAD(arg->y_grad_tbl[i * 2],
arg->y_grad_tbl[i * 2 + 1]);
rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD(i), data);
}
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
index 2ad24deedec8..39b2ac58196e 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
@@ -619,7 +619,7 @@
(((v0) & 0x1FFF) | (((v1) & 0x1FFF) << 13))
#define RKISP1_CIF_ISP_LSC_SECT_SIZE(v0, v1) \
(((v0) & 0xFFF) | (((v1) & 0xFFF) << 16))
-#define RKISP1_CIF_ISP_LSC_GRAD_SIZE(v0, v1) \
+#define RKISP1_CIF_ISP_LSC_SECT_GRAD(v0, v1) \
(((v0) & 0xFFF) | (((v1) & 0xFFF) << 16))
/* LSC: ISP_LSC_TABLE_SEL */
--
Regards,
Laurent Pinchart
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH v1.1 4/5] media: rkisp1: Use correct macro for gradient registers
@ 2022-08-23 17:21 ` Laurent Pinchart
0 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-08-23 17:21 UTC (permalink / raw)
To: linux-media
Cc: linux-rockchip, Dafna Hirschfeld, Heiko Stuebner,
Florian Sylvestre, Paul Elder
The rkisp1_lsc_config() function incorrectly uses the
RKISP1_CIF_ISP_LSC_SECT_SIZE() macro for the gradient registers. Replace
it with the correct macro, and rename it from
RKISP1_CIF_ISP_LSC_GRAD_SIZE() to RKISP1_CIF_ISP_LSC_SECT_GRAD() as the
corresponding registers store the gradients for each sector, not a size.
This doesn't cause any functional change as the two macros are defined
identically (the size and gradient registers store fields in the same
number of bits at the same positions).
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
Changes since v1:
- Rename RKISP1_CIF_ISP_LSC_GRAD_SIZE to RKISP1_CIF_ISP_LSC_SECT_GRAD
---
drivers/media/platform/rockchip/rkisp1/rkisp1-params.c | 4 ++--
drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
index aa6efa4c6e9e..123c26fc1679 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
@@ -334,7 +334,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE(i), data);
/* program x grad tables */
- data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2],
+ data = RKISP1_CIF_ISP_LSC_SECT_GRAD(arg->x_grad_tbl[i * 2],
arg->x_grad_tbl[i * 2 + 1]);
rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD(i), data);
@@ -344,7 +344,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE(i), data);
/* program y grad tables */
- data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2],
+ data = RKISP1_CIF_ISP_LSC_SECT_GRAD(arg->y_grad_tbl[i * 2],
arg->y_grad_tbl[i * 2 + 1]);
rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD(i), data);
}
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
index 2ad24deedec8..39b2ac58196e 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
@@ -619,7 +619,7 @@
(((v0) & 0x1FFF) | (((v1) & 0x1FFF) << 13))
#define RKISP1_CIF_ISP_LSC_SECT_SIZE(v0, v1) \
(((v0) & 0xFFF) | (((v1) & 0xFFF) << 16))
-#define RKISP1_CIF_ISP_LSC_GRAD_SIZE(v0, v1) \
+#define RKISP1_CIF_ISP_LSC_SECT_GRAD(v0, v1) \
(((v0) & 0xFFF) | (((v1) & 0xFFF) << 16))
/* LSC: ISP_LSC_TABLE_SEL */
--
Regards,
Laurent Pinchart
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH v1.1 5/5] media: rkisp1: Configure LSC after enabling the ISP
2022-08-17 2:18 ` Laurent Pinchart
@ 2022-08-23 17:21 ` Laurent Pinchart
-1 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-08-23 17:21 UTC (permalink / raw)
To: linux-media
Cc: linux-rockchip, Dafna Hirschfeld, Heiko Stuebner,
Florian Sylvestre, Paul Elder
The ISP8000Nano v18.02 (found in the i.MX8MP) requires the ISP to be
enabled (as indicated by the ISP_CTRL.ISP_ENABLE bit) to configure the
lens shading table in internal RAM. The driver currently configures all
ISP initial parameters before enabling the ISP, which causes the LSC RAM
to not be initialized properly.
To fix this, split the rkisp1_params_configure() function into a
rkisp1_params_pre_configure() and a rkisp1_params_post_configure(). The
former configures all ISP parameters but LSC, while the latter
configures LSC. To implement this, the rkisp1_params_apply_params_cfg()
function is deconstructed, with two small helpers created to deal with
the parameters buffers, which are then used in rkisp1_params_isr(),
rkisp1_params_pre_configure() and rkisp1_params_post_configure().
While this initialization ordering is only needed for the ISP8000Nano
v18.02, it doesn't affect other ISP versions negatively, and can thus be
followed unconditionally.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
Changes since v1:
- Fix typo
---
.../platform/rockchip/rkisp1/rkisp1-common.h | 29 ++-
.../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
.../platform/rockchip/rkisp1/rkisp1-params.c | 169 ++++++++++++------
3 files changed, 143 insertions(+), 64 deletions(-)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
index 1383c13e22b8..8b317060ab97 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
@@ -589,19 +589,32 @@ void rkisp1_sd_adjust_crop(struct v4l2_rect *crop,
*/
const struct rkisp1_mbus_info *rkisp1_mbus_info_get_by_code(u32 mbus_code);
-/* rkisp1_params_configure - configure the params when stream starts.
- * This function is called by the isp entity upon stream starts.
- * The function applies the initial configuration of the parameters.
+/*
+ * rkisp1_params_pre_configure - Configure the params before stream start
*
- * @params: pointer to rkisp1_params.
+ * @params: pointer to rkisp1_params
* @bayer_pat: the bayer pattern on the isp video sink pad
* @quantization: the quantization configured on the isp's src pad
* @ycbcr_encoding: the ycbcr_encoding configured on the isp's src pad
+ *
+ * This function is called by the ISP entity just before the ISP gets started.
+ * It applies the initial ISP parameters from the first params buffer, but
+ * skips LSC as it needs to be configured after the ISP is started.
*/
-void rkisp1_params_configure(struct rkisp1_params *params,
- enum rkisp1_fmt_raw_pat_type bayer_pat,
- enum v4l2_quantization quantization,
- enum v4l2_ycbcr_encoding ycbcr_encoding);
+void rkisp1_params_pre_configure(struct rkisp1_params *params,
+ enum rkisp1_fmt_raw_pat_type bayer_pat,
+ enum v4l2_quantization quantization,
+ enum v4l2_ycbcr_encoding ycbcr_encoding);
+
+/*
+ * rkisp1_params_post_configure - Configure the params after stream start
+ *
+ * @params: pointer to rkisp1_params
+ *
+ * This function is called by the ISP entity just after the ISP gets started.
+ * It applies the initial ISP LSC parameters from the first params buffer.
+ */
+void rkisp1_params_post_configure(struct rkisp1_params *params);
/* rkisp1_params_disable - disable all parameters.
* This function is called by the isp entity upon stream start
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
index 20c01e0e2e17..81a8fe66f5a7 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
@@ -343,9 +343,9 @@ static int rkisp1_config_isp(struct rkisp1_isp *isp,
src_frm = rkisp1_isp_get_pad_fmt(isp, NULL,
RKISP1_ISP_PAD_SOURCE_VIDEO,
V4L2_SUBDEV_FORMAT_ACTIVE);
- rkisp1_params_configure(&rkisp1->params, sink_fmt->bayer_pat,
- src_frm->quantization,
- src_frm->ycbcr_enc);
+ rkisp1_params_pre_configure(&rkisp1->params, sink_fmt->bayer_pat,
+ src_frm->quantization,
+ src_frm->ycbcr_enc);
}
return 0;
@@ -462,6 +462,9 @@ static int rkisp1_isp_start(struct rkisp1_isp *isp, struct media_pad *source)
RKISP1_CIF_ISP_CTRL_ISP_INFORM_ENABLE;
rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
+ if (isp->src_fmt->pixel_enc == V4L2_PIXEL_ENC_BAYER)
+ rkisp1_params_post_configure(&rkisp1->params);
+
return 0;
}
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
index 123c26fc1679..d8731ebbf479 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
@@ -1297,22 +1297,6 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
RKISP1_CIF_ISP_CTRL_ISP_GAMMA_IN_ENA);
}
- /* update lsc config */
- if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
- rkisp1_lsc_config(params,
- &new_params->others.lsc_config);
-
- if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
- if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
- rkisp1_param_set_bits(params,
- RKISP1_CIF_ISP_LSC_CTRL,
- RKISP1_CIF_ISP_LSC_CTRL_ENA);
- else
- rkisp1_param_clear_bits(params,
- RKISP1_CIF_ISP_LSC_CTRL,
- RKISP1_CIF_ISP_LSC_CTRL_ENA);
- }
-
/* update awb gains */
if (module_cfg_update & RKISP1_CIF_ISP_MODULE_AWB_GAIN)
params->ops->awb_gain_config(params, &new_params->others.awb_gain_config);
@@ -1429,6 +1413,33 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
}
}
+static void
+rkisp1_isp_isr_lsc_config(struct rkisp1_params *params,
+ const struct rkisp1_params_cfg *new_params)
+{
+ unsigned int module_en_update, module_cfg_update, module_ens;
+
+ module_en_update = new_params->module_en_update;
+ module_cfg_update = new_params->module_cfg_update;
+ module_ens = new_params->module_ens;
+
+ /* update lsc config */
+ if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
+ rkisp1_lsc_config(params,
+ &new_params->others.lsc_config);
+
+ if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
+ if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
+ rkisp1_param_set_bits(params,
+ RKISP1_CIF_ISP_LSC_CTRL,
+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
+ else
+ rkisp1_param_clear_bits(params,
+ RKISP1_CIF_ISP_LSC_CTRL,
+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
+ }
+}
+
static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
struct rkisp1_params_cfg *new_params)
{
@@ -1490,47 +1501,60 @@ static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
}
}
-static void rkisp1_params_apply_params_cfg(struct rkisp1_params *params,
- unsigned int frame_sequence)
+static bool rkisp1_params_get_buffer(struct rkisp1_params *params,
+ struct rkisp1_buffer **buf,
+ struct rkisp1_params_cfg **cfg)
{
- struct rkisp1_params_cfg *new_params;
- struct rkisp1_buffer *cur_buf = NULL;
-
if (list_empty(¶ms->params))
- return;
+ return false;
- cur_buf = list_first_entry(¶ms->params,
- struct rkisp1_buffer, queue);
+ *buf = list_first_entry(¶ms->params, struct rkisp1_buffer, queue);
+ *cfg = vb2_plane_vaddr(&(*buf)->vb.vb2_buf, 0);
- new_params = (struct rkisp1_params_cfg *)vb2_plane_vaddr(&cur_buf->vb.vb2_buf, 0);
+ return true;
+}
- rkisp1_isp_isr_other_config(params, new_params);
- rkisp1_isp_isr_meas_config(params, new_params);
+static void rkisp1_params_complete_buffer(struct rkisp1_params *params,
+ struct rkisp1_buffer *buf,
+ unsigned int frame_sequence)
+{
+ list_del(&buf->queue);
- /* update shadow register immediately */
- rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL, RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
-
- list_del(&cur_buf->queue);
-
- cur_buf->vb.sequence = frame_sequence;
- vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
+ buf->vb.sequence = frame_sequence;
+ vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
}
void rkisp1_params_isr(struct rkisp1_device *rkisp1)
{
- /*
- * This isr is called when the ISR finishes processing a frame (RKISP1_CIF_ISP_FRAME).
- * Configurations performed here will be applied on the next frame.
- * Since frame_sequence is updated on the vertical sync signal, we should use
- * frame_sequence + 1 here to indicate to userspace on which frame these parameters
- * are being applied.
- */
- unsigned int frame_sequence = rkisp1->isp.frame_sequence + 1;
struct rkisp1_params *params = &rkisp1->params;
+ struct rkisp1_params_cfg *new_params;
+ struct rkisp1_buffer *cur_buf;
spin_lock(¶ms->config_lock);
- rkisp1_params_apply_params_cfg(params, frame_sequence);
+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
+ goto unlock;
+
+ rkisp1_isp_isr_other_config(params, new_params);
+ rkisp1_isp_isr_lsc_config(params, new_params);
+ rkisp1_isp_isr_meas_config(params, new_params);
+
+ /* update shadow register immediately */
+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
+
+ /*
+ * This isr is called when the ISR finishes processing a frame
+ * (RKISP1_CIF_ISP_FRAME). Configurations performed here will be
+ * applied on the next frame. Since frame_sequence is updated on the
+ * vertical sync signal, we should use frame_sequence + 1 here to
+ * indicate to userspace on which frame these parameters are being
+ * applied.
+ */
+ rkisp1_params_complete_buffer(params, cur_buf,
+ rkisp1->isp.frame_sequence + 1);
+
+unlock:
spin_unlock(¶ms->config_lock);
}
@@ -1573,9 +1597,18 @@ static const struct rkisp1_cif_isp_afc_config rkisp1_afc_params_default_config =
14
};
-static void rkisp1_params_config_parameter(struct rkisp1_params *params)
+void rkisp1_params_pre_configure(struct rkisp1_params *params,
+ enum rkisp1_fmt_raw_pat_type bayer_pat,
+ enum v4l2_quantization quantization,
+ enum v4l2_ycbcr_encoding ycbcr_encoding)
{
struct rkisp1_cif_isp_hst_config hst = rkisp1_hst_params_default_config;
+ struct rkisp1_params_cfg *new_params;
+ struct rkisp1_buffer *cur_buf;
+
+ params->quantization = quantization;
+ params->ycbcr_encoding = ycbcr_encoding;
+ params->raw_type = bayer_pat;
params->ops->awb_meas_config(params, &rkisp1_awb_params_default_config);
params->ops->awb_meas_enable(params, &rkisp1_awb_params_default_config,
@@ -1599,20 +1632,50 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params)
spin_lock_irq(¶ms->config_lock);
/* apply the first buffer if there is one already */
- rkisp1_params_apply_params_cfg(params, 0);
+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
+ goto unlock;
+
+ rkisp1_isp_isr_other_config(params, new_params);
+ rkisp1_isp_isr_meas_config(params, new_params);
+
+ /* update shadow register immediately */
+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
+
+unlock:
spin_unlock_irq(¶ms->config_lock);
}
-void rkisp1_params_configure(struct rkisp1_params *params,
- enum rkisp1_fmt_raw_pat_type bayer_pat,
- enum v4l2_quantization quantization,
- enum v4l2_ycbcr_encoding ycbcr_encoding)
+void rkisp1_params_post_configure(struct rkisp1_params *params)
{
- params->quantization = quantization;
- params->ycbcr_encoding = ycbcr_encoding;
- params->raw_type = bayer_pat;
- rkisp1_params_config_parameter(params);
+ struct rkisp1_params_cfg *new_params;
+ struct rkisp1_buffer *cur_buf;
+
+ spin_lock_irq(¶ms->config_lock);
+
+ /*
+ * Apply LSC parameters from the first buffer (if any is already
+ * available. This must be done after the ISP gets started in the
+ * ISP8000Nano v18.02 (found in the i.MX8MP) as access to the LSC RAM
+ * is gated by the ISP_CTRL.ISP_ENABLE bit. As this initialization
+ * ordering doesn't affect other ISP versions negatively, do so
+ * unconditionally.
+ */
+
+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
+ goto unlock;
+
+ rkisp1_isp_isr_lsc_config(params, new_params);
+
+ /* update shadow register immediately */
+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
+
+ rkisp1_params_complete_buffer(params, cur_buf, 0);
+
+unlock:
+ spin_unlock_irq(¶ms->config_lock);
}
/*
--
Regards,
Laurent Pinchart
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH v1.1 5/5] media: rkisp1: Configure LSC after enabling the ISP
@ 2022-08-23 17:21 ` Laurent Pinchart
0 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-08-23 17:21 UTC (permalink / raw)
To: linux-media
Cc: linux-rockchip, Dafna Hirschfeld, Heiko Stuebner,
Florian Sylvestre, Paul Elder
The ISP8000Nano v18.02 (found in the i.MX8MP) requires the ISP to be
enabled (as indicated by the ISP_CTRL.ISP_ENABLE bit) to configure the
lens shading table in internal RAM. The driver currently configures all
ISP initial parameters before enabling the ISP, which causes the LSC RAM
to not be initialized properly.
To fix this, split the rkisp1_params_configure() function into a
rkisp1_params_pre_configure() and a rkisp1_params_post_configure(). The
former configures all ISP parameters but LSC, while the latter
configures LSC. To implement this, the rkisp1_params_apply_params_cfg()
function is deconstructed, with two small helpers created to deal with
the parameters buffers, which are then used in rkisp1_params_isr(),
rkisp1_params_pre_configure() and rkisp1_params_post_configure().
While this initialization ordering is only needed for the ISP8000Nano
v18.02, it doesn't affect other ISP versions negatively, and can thus be
followed unconditionally.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
Changes since v1:
- Fix typo
---
.../platform/rockchip/rkisp1/rkisp1-common.h | 29 ++-
.../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
.../platform/rockchip/rkisp1/rkisp1-params.c | 169 ++++++++++++------
3 files changed, 143 insertions(+), 64 deletions(-)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
index 1383c13e22b8..8b317060ab97 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
@@ -589,19 +589,32 @@ void rkisp1_sd_adjust_crop(struct v4l2_rect *crop,
*/
const struct rkisp1_mbus_info *rkisp1_mbus_info_get_by_code(u32 mbus_code);
-/* rkisp1_params_configure - configure the params when stream starts.
- * This function is called by the isp entity upon stream starts.
- * The function applies the initial configuration of the parameters.
+/*
+ * rkisp1_params_pre_configure - Configure the params before stream start
*
- * @params: pointer to rkisp1_params.
+ * @params: pointer to rkisp1_params
* @bayer_pat: the bayer pattern on the isp video sink pad
* @quantization: the quantization configured on the isp's src pad
* @ycbcr_encoding: the ycbcr_encoding configured on the isp's src pad
+ *
+ * This function is called by the ISP entity just before the ISP gets started.
+ * It applies the initial ISP parameters from the first params buffer, but
+ * skips LSC as it needs to be configured after the ISP is started.
*/
-void rkisp1_params_configure(struct rkisp1_params *params,
- enum rkisp1_fmt_raw_pat_type bayer_pat,
- enum v4l2_quantization quantization,
- enum v4l2_ycbcr_encoding ycbcr_encoding);
+void rkisp1_params_pre_configure(struct rkisp1_params *params,
+ enum rkisp1_fmt_raw_pat_type bayer_pat,
+ enum v4l2_quantization quantization,
+ enum v4l2_ycbcr_encoding ycbcr_encoding);
+
+/*
+ * rkisp1_params_post_configure - Configure the params after stream start
+ *
+ * @params: pointer to rkisp1_params
+ *
+ * This function is called by the ISP entity just after the ISP gets started.
+ * It applies the initial ISP LSC parameters from the first params buffer.
+ */
+void rkisp1_params_post_configure(struct rkisp1_params *params);
/* rkisp1_params_disable - disable all parameters.
* This function is called by the isp entity upon stream start
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
index 20c01e0e2e17..81a8fe66f5a7 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
@@ -343,9 +343,9 @@ static int rkisp1_config_isp(struct rkisp1_isp *isp,
src_frm = rkisp1_isp_get_pad_fmt(isp, NULL,
RKISP1_ISP_PAD_SOURCE_VIDEO,
V4L2_SUBDEV_FORMAT_ACTIVE);
- rkisp1_params_configure(&rkisp1->params, sink_fmt->bayer_pat,
- src_frm->quantization,
- src_frm->ycbcr_enc);
+ rkisp1_params_pre_configure(&rkisp1->params, sink_fmt->bayer_pat,
+ src_frm->quantization,
+ src_frm->ycbcr_enc);
}
return 0;
@@ -462,6 +462,9 @@ static int rkisp1_isp_start(struct rkisp1_isp *isp, struct media_pad *source)
RKISP1_CIF_ISP_CTRL_ISP_INFORM_ENABLE;
rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
+ if (isp->src_fmt->pixel_enc == V4L2_PIXEL_ENC_BAYER)
+ rkisp1_params_post_configure(&rkisp1->params);
+
return 0;
}
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
index 123c26fc1679..d8731ebbf479 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
@@ -1297,22 +1297,6 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
RKISP1_CIF_ISP_CTRL_ISP_GAMMA_IN_ENA);
}
- /* update lsc config */
- if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
- rkisp1_lsc_config(params,
- &new_params->others.lsc_config);
-
- if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
- if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
- rkisp1_param_set_bits(params,
- RKISP1_CIF_ISP_LSC_CTRL,
- RKISP1_CIF_ISP_LSC_CTRL_ENA);
- else
- rkisp1_param_clear_bits(params,
- RKISP1_CIF_ISP_LSC_CTRL,
- RKISP1_CIF_ISP_LSC_CTRL_ENA);
- }
-
/* update awb gains */
if (module_cfg_update & RKISP1_CIF_ISP_MODULE_AWB_GAIN)
params->ops->awb_gain_config(params, &new_params->others.awb_gain_config);
@@ -1429,6 +1413,33 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
}
}
+static void
+rkisp1_isp_isr_lsc_config(struct rkisp1_params *params,
+ const struct rkisp1_params_cfg *new_params)
+{
+ unsigned int module_en_update, module_cfg_update, module_ens;
+
+ module_en_update = new_params->module_en_update;
+ module_cfg_update = new_params->module_cfg_update;
+ module_ens = new_params->module_ens;
+
+ /* update lsc config */
+ if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
+ rkisp1_lsc_config(params,
+ &new_params->others.lsc_config);
+
+ if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
+ if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
+ rkisp1_param_set_bits(params,
+ RKISP1_CIF_ISP_LSC_CTRL,
+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
+ else
+ rkisp1_param_clear_bits(params,
+ RKISP1_CIF_ISP_LSC_CTRL,
+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
+ }
+}
+
static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
struct rkisp1_params_cfg *new_params)
{
@@ -1490,47 +1501,60 @@ static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
}
}
-static void rkisp1_params_apply_params_cfg(struct rkisp1_params *params,
- unsigned int frame_sequence)
+static bool rkisp1_params_get_buffer(struct rkisp1_params *params,
+ struct rkisp1_buffer **buf,
+ struct rkisp1_params_cfg **cfg)
{
- struct rkisp1_params_cfg *new_params;
- struct rkisp1_buffer *cur_buf = NULL;
-
if (list_empty(¶ms->params))
- return;
+ return false;
- cur_buf = list_first_entry(¶ms->params,
- struct rkisp1_buffer, queue);
+ *buf = list_first_entry(¶ms->params, struct rkisp1_buffer, queue);
+ *cfg = vb2_plane_vaddr(&(*buf)->vb.vb2_buf, 0);
- new_params = (struct rkisp1_params_cfg *)vb2_plane_vaddr(&cur_buf->vb.vb2_buf, 0);
+ return true;
+}
- rkisp1_isp_isr_other_config(params, new_params);
- rkisp1_isp_isr_meas_config(params, new_params);
+static void rkisp1_params_complete_buffer(struct rkisp1_params *params,
+ struct rkisp1_buffer *buf,
+ unsigned int frame_sequence)
+{
+ list_del(&buf->queue);
- /* update shadow register immediately */
- rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL, RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
-
- list_del(&cur_buf->queue);
-
- cur_buf->vb.sequence = frame_sequence;
- vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
+ buf->vb.sequence = frame_sequence;
+ vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
}
void rkisp1_params_isr(struct rkisp1_device *rkisp1)
{
- /*
- * This isr is called when the ISR finishes processing a frame (RKISP1_CIF_ISP_FRAME).
- * Configurations performed here will be applied on the next frame.
- * Since frame_sequence is updated on the vertical sync signal, we should use
- * frame_sequence + 1 here to indicate to userspace on which frame these parameters
- * are being applied.
- */
- unsigned int frame_sequence = rkisp1->isp.frame_sequence + 1;
struct rkisp1_params *params = &rkisp1->params;
+ struct rkisp1_params_cfg *new_params;
+ struct rkisp1_buffer *cur_buf;
spin_lock(¶ms->config_lock);
- rkisp1_params_apply_params_cfg(params, frame_sequence);
+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
+ goto unlock;
+
+ rkisp1_isp_isr_other_config(params, new_params);
+ rkisp1_isp_isr_lsc_config(params, new_params);
+ rkisp1_isp_isr_meas_config(params, new_params);
+
+ /* update shadow register immediately */
+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
+
+ /*
+ * This isr is called when the ISR finishes processing a frame
+ * (RKISP1_CIF_ISP_FRAME). Configurations performed here will be
+ * applied on the next frame. Since frame_sequence is updated on the
+ * vertical sync signal, we should use frame_sequence + 1 here to
+ * indicate to userspace on which frame these parameters are being
+ * applied.
+ */
+ rkisp1_params_complete_buffer(params, cur_buf,
+ rkisp1->isp.frame_sequence + 1);
+
+unlock:
spin_unlock(¶ms->config_lock);
}
@@ -1573,9 +1597,18 @@ static const struct rkisp1_cif_isp_afc_config rkisp1_afc_params_default_config =
14
};
-static void rkisp1_params_config_parameter(struct rkisp1_params *params)
+void rkisp1_params_pre_configure(struct rkisp1_params *params,
+ enum rkisp1_fmt_raw_pat_type bayer_pat,
+ enum v4l2_quantization quantization,
+ enum v4l2_ycbcr_encoding ycbcr_encoding)
{
struct rkisp1_cif_isp_hst_config hst = rkisp1_hst_params_default_config;
+ struct rkisp1_params_cfg *new_params;
+ struct rkisp1_buffer *cur_buf;
+
+ params->quantization = quantization;
+ params->ycbcr_encoding = ycbcr_encoding;
+ params->raw_type = bayer_pat;
params->ops->awb_meas_config(params, &rkisp1_awb_params_default_config);
params->ops->awb_meas_enable(params, &rkisp1_awb_params_default_config,
@@ -1599,20 +1632,50 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params)
spin_lock_irq(¶ms->config_lock);
/* apply the first buffer if there is one already */
- rkisp1_params_apply_params_cfg(params, 0);
+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
+ goto unlock;
+
+ rkisp1_isp_isr_other_config(params, new_params);
+ rkisp1_isp_isr_meas_config(params, new_params);
+
+ /* update shadow register immediately */
+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
+
+unlock:
spin_unlock_irq(¶ms->config_lock);
}
-void rkisp1_params_configure(struct rkisp1_params *params,
- enum rkisp1_fmt_raw_pat_type bayer_pat,
- enum v4l2_quantization quantization,
- enum v4l2_ycbcr_encoding ycbcr_encoding)
+void rkisp1_params_post_configure(struct rkisp1_params *params)
{
- params->quantization = quantization;
- params->ycbcr_encoding = ycbcr_encoding;
- params->raw_type = bayer_pat;
- rkisp1_params_config_parameter(params);
+ struct rkisp1_params_cfg *new_params;
+ struct rkisp1_buffer *cur_buf;
+
+ spin_lock_irq(¶ms->config_lock);
+
+ /*
+ * Apply LSC parameters from the first buffer (if any is already
+ * available. This must be done after the ISP gets started in the
+ * ISP8000Nano v18.02 (found in the i.MX8MP) as access to the LSC RAM
+ * is gated by the ISP_CTRL.ISP_ENABLE bit. As this initialization
+ * ordering doesn't affect other ISP versions negatively, do so
+ * unconditionally.
+ */
+
+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
+ goto unlock;
+
+ rkisp1_isp_isr_lsc_config(params, new_params);
+
+ /* update shadow register immediately */
+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
+
+ rkisp1_params_complete_buffer(params, cur_buf, 0);
+
+unlock:
+ spin_unlock_irq(¶ms->config_lock);
}
/*
--
Regards,
Laurent Pinchart
^ permalink raw reply related [flat|nested] 46+ messages in thread
* Re: [PATCH v1.1 4/5] media: rkisp1: Use correct macro for gradient registers
2022-08-23 17:21 ` Laurent Pinchart
@ 2022-08-26 19:06 ` Dafna Hirschfeld
-1 siblings, 0 replies; 46+ messages in thread
From: Dafna Hirschfeld @ 2022-08-26 19:06 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, linux-rockchip, Heiko Stuebner, Florian Sylvestre,
Paul Elder
On 23.08.2022 20:21, Laurent Pinchart wrote:
>The rkisp1_lsc_config() function incorrectly uses the
>RKISP1_CIF_ISP_LSC_SECT_SIZE() macro for the gradient registers. Replace
>it with the correct macro, and rename it from
>RKISP1_CIF_ISP_LSC_GRAD_SIZE() to RKISP1_CIF_ISP_LSC_SECT_GRAD() as the
>corresponding registers store the gradients for each sector, not a size.
>This doesn't cause any functional change as the two macros are defined
>identically (the size and gradient registers store fields in the same
>number of bits at the same positions).
>
>Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Dafna Hirschfeld <dafna@fastmail.com>
>---
>Changes since v1:
>
>- Rename RKISP1_CIF_ISP_LSC_GRAD_SIZE to RKISP1_CIF_ISP_LSC_SECT_GRAD
>---
> drivers/media/platform/rockchip/rkisp1/rkisp1-params.c | 4 ++--
> drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>index aa6efa4c6e9e..123c26fc1679 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>@@ -334,7 +334,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE(i), data);
>
> /* program x grad tables */
>- data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2],
>+ data = RKISP1_CIF_ISP_LSC_SECT_GRAD(arg->x_grad_tbl[i * 2],
> arg->x_grad_tbl[i * 2 + 1]);
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD(i), data);
>
>@@ -344,7 +344,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE(i), data);
>
> /* program y grad tables */
>- data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2],
>+ data = RKISP1_CIF_ISP_LSC_SECT_GRAD(arg->y_grad_tbl[i * 2],
> arg->y_grad_tbl[i * 2 + 1]);
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD(i), data);
> }
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
>index 2ad24deedec8..39b2ac58196e 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
>@@ -619,7 +619,7 @@
> (((v0) & 0x1FFF) | (((v1) & 0x1FFF) << 13))
> #define RKISP1_CIF_ISP_LSC_SECT_SIZE(v0, v1) \
> (((v0) & 0xFFF) | (((v1) & 0xFFF) << 16))
>-#define RKISP1_CIF_ISP_LSC_GRAD_SIZE(v0, v1) \
>+#define RKISP1_CIF_ISP_LSC_SECT_GRAD(v0, v1) \
> (((v0) & 0xFFF) | (((v1) & 0xFFF) << 16))
>
> /* LSC: ISP_LSC_TABLE_SEL */
>--
>Regards,
>
>Laurent Pinchart
>
>
>_______________________________________________
>Linux-rockchip mailing list
>Linux-rockchip@lists.infradead.org
>http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH v1.1 4/5] media: rkisp1: Use correct macro for gradient registers
@ 2022-08-26 19:06 ` Dafna Hirschfeld
0 siblings, 0 replies; 46+ messages in thread
From: Dafna Hirschfeld @ 2022-08-26 19:06 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, linux-rockchip, Heiko Stuebner, Florian Sylvestre,
Paul Elder
On 23.08.2022 20:21, Laurent Pinchart wrote:
>The rkisp1_lsc_config() function incorrectly uses the
>RKISP1_CIF_ISP_LSC_SECT_SIZE() macro for the gradient registers. Replace
>it with the correct macro, and rename it from
>RKISP1_CIF_ISP_LSC_GRAD_SIZE() to RKISP1_CIF_ISP_LSC_SECT_GRAD() as the
>corresponding registers store the gradients for each sector, not a size.
>This doesn't cause any functional change as the two macros are defined
>identically (the size and gradient registers store fields in the same
>number of bits at the same positions).
>
>Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Dafna Hirschfeld <dafna@fastmail.com>
>---
>Changes since v1:
>
>- Rename RKISP1_CIF_ISP_LSC_GRAD_SIZE to RKISP1_CIF_ISP_LSC_SECT_GRAD
>---
> drivers/media/platform/rockchip/rkisp1/rkisp1-params.c | 4 ++--
> drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>index aa6efa4c6e9e..123c26fc1679 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>@@ -334,7 +334,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XSIZE(i), data);
>
> /* program x grad tables */
>- data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2],
>+ data = RKISP1_CIF_ISP_LSC_SECT_GRAD(arg->x_grad_tbl[i * 2],
> arg->x_grad_tbl[i * 2 + 1]);
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_XGRAD(i), data);
>
>@@ -344,7 +344,7 @@ static void rkisp1_lsc_config(struct rkisp1_params *params,
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YSIZE(i), data);
>
> /* program y grad tables */
>- data = RKISP1_CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2],
>+ data = RKISP1_CIF_ISP_LSC_SECT_GRAD(arg->y_grad_tbl[i * 2],
> arg->y_grad_tbl[i * 2 + 1]);
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_LSC_YGRAD(i), data);
> }
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
>index 2ad24deedec8..39b2ac58196e 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
>@@ -619,7 +619,7 @@
> (((v0) & 0x1FFF) | (((v1) & 0x1FFF) << 13))
> #define RKISP1_CIF_ISP_LSC_SECT_SIZE(v0, v1) \
> (((v0) & 0xFFF) | (((v1) & 0xFFF) << 16))
>-#define RKISP1_CIF_ISP_LSC_GRAD_SIZE(v0, v1) \
>+#define RKISP1_CIF_ISP_LSC_SECT_GRAD(v0, v1) \
> (((v0) & 0xFFF) | (((v1) & 0xFFF) << 16))
>
> /* LSC: ISP_LSC_TABLE_SEL */
>--
>Regards,
>
>Laurent Pinchart
>
>
>_______________________________________________
>Linux-rockchip mailing list
>Linux-rockchip@lists.infradead.org
>http://lists.infradead.org/mailman/listinfo/linux-rockchip
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 0/5] media: rkisp1: Fix LSC initial configuration on i.MX8MP
2022-08-17 2:18 ` Laurent Pinchart
@ 2022-09-02 9:07 ` Dafna Hirschfeld
-1 siblings, 0 replies; 46+ messages in thread
From: Dafna Hirschfeld @ 2022-09-02 9:07 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
On 17.08.2022 05:18, Laurent Pinchart wrote:
>Hello,
>
>This patch series fixes the Lens Shading Correction initial
>configuration on the i.MX8MP.
>
>The i.MX8MP integrates an ISP8000Nano v18.02, which unlike other
>versions currently supported by the driver, gates access to the LSC RAM
>with the ISP_CTRL.ISP_ENABLE bit. The initial LSC configuration being
>performed before the ISP gets enabled, the writes to the RAM are
>ignored, leading to incorrect results.
>
>The series starts with four small drive-by cleanups of the LSC code, and
>patch 5/5 then fixes the issue. I'm not totally thrilled by the code
>architecture, but I'm not sure why, and I have a feeling doing better
>would require a large refactoring of the ISP parameters handling. If
>anyone sees an option for a better implementation, please say so.
>
>The series is based on top of "[PATCH 0/7] media: rkisp1: Fix and
>improve color space support" ([1]). Reviews for that base series would
>thus be appreciated too.
>
>[1] https://lore.kernel.org/linux-media/20220815065235.23797-1-laurent.pinchart@ideasonboard.com
Hi, I see that the series is also based on "[PATCH v2 00/55] media: rkisp1: Cleanups and add support"
right? I could not apply patch 5/5 because it seems to sit on top of
'[PATCH v2 49/55] media: rkisp1: Configure gasket on i.MX8MP'
Do you have a branch you can share with all the sets?
Thanks,
Dafna
>
>Laurent Pinchart (5):
> media: rkisp1: Clean up LSC configuration code
> media: rkisp1: Store LSC register values in u32 variables
> media: rkisp1: Simplify LSC x/y size and grad register macros
> media: rkisp1: Use RKISP1_CIF_ISP_LSC_GRAD_SIZE() for gradient
> registers
> media: rkisp1: Configure LSC after enabling the ISP
>
> .../platform/rockchip/rkisp1/rkisp1-common.h | 29 +-
> .../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
> .../platform/rockchip/rkisp1/rkisp1-params.c | 378 ++++++++++--------
> .../platform/rockchip/rkisp1/rkisp1-regs.h | 20 +-
> 4 files changed, 239 insertions(+), 197 deletions(-)
>
>--
>Regards,
>
>Laurent Pinchart
>
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 0/5] media: rkisp1: Fix LSC initial configuration on i.MX8MP
@ 2022-09-02 9:07 ` Dafna Hirschfeld
0 siblings, 0 replies; 46+ messages in thread
From: Dafna Hirschfeld @ 2022-09-02 9:07 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
On 17.08.2022 05:18, Laurent Pinchart wrote:
>Hello,
>
>This patch series fixes the Lens Shading Correction initial
>configuration on the i.MX8MP.
>
>The i.MX8MP integrates an ISP8000Nano v18.02, which unlike other
>versions currently supported by the driver, gates access to the LSC RAM
>with the ISP_CTRL.ISP_ENABLE bit. The initial LSC configuration being
>performed before the ISP gets enabled, the writes to the RAM are
>ignored, leading to incorrect results.
>
>The series starts with four small drive-by cleanups of the LSC code, and
>patch 5/5 then fixes the issue. I'm not totally thrilled by the code
>architecture, but I'm not sure why, and I have a feeling doing better
>would require a large refactoring of the ISP parameters handling. If
>anyone sees an option for a better implementation, please say so.
>
>The series is based on top of "[PATCH 0/7] media: rkisp1: Fix and
>improve color space support" ([1]). Reviews for that base series would
>thus be appreciated too.
>
>[1] https://lore.kernel.org/linux-media/20220815065235.23797-1-laurent.pinchart@ideasonboard.com
Hi, I see that the series is also based on "[PATCH v2 00/55] media: rkisp1: Cleanups and add support"
right? I could not apply patch 5/5 because it seems to sit on top of
'[PATCH v2 49/55] media: rkisp1: Configure gasket on i.MX8MP'
Do you have a branch you can share with all the sets?
Thanks,
Dafna
>
>Laurent Pinchart (5):
> media: rkisp1: Clean up LSC configuration code
> media: rkisp1: Store LSC register values in u32 variables
> media: rkisp1: Simplify LSC x/y size and grad register macros
> media: rkisp1: Use RKISP1_CIF_ISP_LSC_GRAD_SIZE() for gradient
> registers
> media: rkisp1: Configure LSC after enabling the ISP
>
> .../platform/rockchip/rkisp1/rkisp1-common.h | 29 +-
> .../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
> .../platform/rockchip/rkisp1/rkisp1-params.c | 378 ++++++++++--------
> .../platform/rockchip/rkisp1/rkisp1-regs.h | 20 +-
> 4 files changed, 239 insertions(+), 197 deletions(-)
>
>--
>Regards,
>
>Laurent Pinchart
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 0/5] media: rkisp1: Fix LSC initial configuration on i.MX8MP
2022-09-02 9:07 ` Dafna Hirschfeld
@ 2022-09-02 10:07 ` Laurent Pinchart
-1 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-09-02 10:07 UTC (permalink / raw)
To: Dafna Hirschfeld
Cc: linux-media, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
Hi Dafna,
On Fri, Sep 02, 2022 at 12:07:04PM +0300, Dafna Hirschfeld wrote:
> On 17.08.2022 05:18, Laurent Pinchart wrote:
> > Hello,
> >
> > This patch series fixes the Lens Shading Correction initial
> > configuration on the i.MX8MP.
> >
> > The i.MX8MP integrates an ISP8000Nano v18.02, which unlike other
> > versions currently supported by the driver, gates access to the LSC RAM
> > with the ISP_CTRL.ISP_ENABLE bit. The initial LSC configuration being
> > performed before the ISP gets enabled, the writes to the RAM are
> > ignored, leading to incorrect results.
> >
> > The series starts with four small drive-by cleanups of the LSC code, and
> > patch 5/5 then fixes the issue. I'm not totally thrilled by the code
> > architecture, but I'm not sure why, and I have a feeling doing better
> > would require a large refactoring of the ISP parameters handling. If
> > anyone sees an option for a better implementation, please say so.
> >
> > The series is based on top of "[PATCH 0/7] media: rkisp1: Fix and
> > improve color space support" ([1]). Reviews for that base series would
> > thus be appreciated too.
> >
> > [1] https://lore.kernel.org/linux-media/20220815065235.23797-1-laurent.pinchart@ideasonboard.com
>
> Hi, I see that the series is also based on "[PATCH v2 00/55] media: rkisp1: Cleanups and add support"
> right? I could not apply patch 5/5 because it seems to sit on top of
> '[PATCH v2 49/55] media: rkisp1: Configure gasket on i.MX8MP'
> Do you have a branch you can share with all the sets?
Sure. You can find all pending patches for the rkisp1 at
https://gitlab.com/ideasonboard/nxp/linux/-/tree/pinchartl/v6.0/isp.
Commits up to and including "media: rkisp1: Zero v4l2_subdev_format
fields in when validating links" are candidates for v6.1, commits
starting at "dt-bindings: media: rkisp1: Add i.MX8MP ISP to compatible"
need some more work.
> > Laurent Pinchart (5):
> > media: rkisp1: Clean up LSC configuration code
> > media: rkisp1: Store LSC register values in u32 variables
> > media: rkisp1: Simplify LSC x/y size and grad register macros
> > media: rkisp1: Use RKISP1_CIF_ISP_LSC_GRAD_SIZE() for gradient
> > registers
> > media: rkisp1: Configure LSC after enabling the ISP
> >
> > .../platform/rockchip/rkisp1/rkisp1-common.h | 29 +-
> > .../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
> > .../platform/rockchip/rkisp1/rkisp1-params.c | 378 ++++++++++--------
> > .../platform/rockchip/rkisp1/rkisp1-regs.h | 20 +-
> > 4 files changed, 239 insertions(+), 197 deletions(-)
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 0/5] media: rkisp1: Fix LSC initial configuration on i.MX8MP
@ 2022-09-02 10:07 ` Laurent Pinchart
0 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-09-02 10:07 UTC (permalink / raw)
To: Dafna Hirschfeld
Cc: linux-media, Heiko Stuebner, linux-rockchip, Paul Elder,
Florian Sylvestre
Hi Dafna,
On Fri, Sep 02, 2022 at 12:07:04PM +0300, Dafna Hirschfeld wrote:
> On 17.08.2022 05:18, Laurent Pinchart wrote:
> > Hello,
> >
> > This patch series fixes the Lens Shading Correction initial
> > configuration on the i.MX8MP.
> >
> > The i.MX8MP integrates an ISP8000Nano v18.02, which unlike other
> > versions currently supported by the driver, gates access to the LSC RAM
> > with the ISP_CTRL.ISP_ENABLE bit. The initial LSC configuration being
> > performed before the ISP gets enabled, the writes to the RAM are
> > ignored, leading to incorrect results.
> >
> > The series starts with four small drive-by cleanups of the LSC code, and
> > patch 5/5 then fixes the issue. I'm not totally thrilled by the code
> > architecture, but I'm not sure why, and I have a feeling doing better
> > would require a large refactoring of the ISP parameters handling. If
> > anyone sees an option for a better implementation, please say so.
> >
> > The series is based on top of "[PATCH 0/7] media: rkisp1: Fix and
> > improve color space support" ([1]). Reviews for that base series would
> > thus be appreciated too.
> >
> > [1] https://lore.kernel.org/linux-media/20220815065235.23797-1-laurent.pinchart@ideasonboard.com
>
> Hi, I see that the series is also based on "[PATCH v2 00/55] media: rkisp1: Cleanups and add support"
> right? I could not apply patch 5/5 because it seems to sit on top of
> '[PATCH v2 49/55] media: rkisp1: Configure gasket on i.MX8MP'
> Do you have a branch you can share with all the sets?
Sure. You can find all pending patches for the rkisp1 at
https://gitlab.com/ideasonboard/nxp/linux/-/tree/pinchartl/v6.0/isp.
Commits up to and including "media: rkisp1: Zero v4l2_subdev_format
fields in when validating links" are candidates for v6.1, commits
starting at "dt-bindings: media: rkisp1: Add i.MX8MP ISP to compatible"
need some more work.
> > Laurent Pinchart (5):
> > media: rkisp1: Clean up LSC configuration code
> > media: rkisp1: Store LSC register values in u32 variables
> > media: rkisp1: Simplify LSC x/y size and grad register macros
> > media: rkisp1: Use RKISP1_CIF_ISP_LSC_GRAD_SIZE() for gradient
> > registers
> > media: rkisp1: Configure LSC after enabling the ISP
> >
> > .../platform/rockchip/rkisp1/rkisp1-common.h | 29 +-
> > .../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
> > .../platform/rockchip/rkisp1/rkisp1-params.c | 378 ++++++++++--------
> > .../platform/rockchip/rkisp1/rkisp1-regs.h | 20 +-
> > 4 files changed, 239 insertions(+), 197 deletions(-)
--
Regards,
Laurent Pinchart
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH v1.1 5/5] media: rkisp1: Configure LSC after enabling the ISP
2022-08-23 17:21 ` Laurent Pinchart
@ 2022-09-03 3:09 ` Dafna Hirschfeld
-1 siblings, 0 replies; 46+ messages in thread
From: Dafna Hirschfeld @ 2022-09-03 3:09 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, linux-rockchip, Heiko Stuebner, Florian Sylvestre,
Paul Elder
On 23.08.2022 20:21, Laurent Pinchart wrote:
>The ISP8000Nano v18.02 (found in the i.MX8MP) requires the ISP to be
>enabled (as indicated by the ISP_CTRL.ISP_ENABLE bit) to configure the
>lens shading table in internal RAM. The driver currently configures all
>ISP initial parameters before enabling the ISP, which causes the LSC RAM
>to not be initialized properly.
>
>To fix this, split the rkisp1_params_configure() function into a
>rkisp1_params_pre_configure() and a rkisp1_params_post_configure(). The
>former configures all ISP parameters but LSC, while the latter
>configures LSC. To implement this, the rkisp1_params_apply_params_cfg()
>function is deconstructed, with two small helpers created to deal with
>the parameters buffers, which are then used in rkisp1_params_isr(),
>rkisp1_params_pre_configure() and rkisp1_params_post_configure().
>
>While this initialization ordering is only needed for the ISP8000Nano
>v18.02, it doesn't affect other ISP versions negatively, and can thus be
>followed unconditionally.
>
>Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>---
>Changes since v1:
>
>- Fix typo
>---
> .../platform/rockchip/rkisp1/rkisp1-common.h | 29 ++-
> .../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
> .../platform/rockchip/rkisp1/rkisp1-params.c | 169 ++++++++++++------
> 3 files changed, 143 insertions(+), 64 deletions(-)
>
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>index 1383c13e22b8..8b317060ab97 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>@@ -589,19 +589,32 @@ void rkisp1_sd_adjust_crop(struct v4l2_rect *crop,
> */
> const struct rkisp1_mbus_info *rkisp1_mbus_info_get_by_code(u32 mbus_code);
>
>-/* rkisp1_params_configure - configure the params when stream starts.
>- * This function is called by the isp entity upon stream starts.
>- * The function applies the initial configuration of the parameters.
>+/*
>+ * rkisp1_params_pre_configure - Configure the params before stream start
> *
>- * @params: pointer to rkisp1_params.
>+ * @params: pointer to rkisp1_params
> * @bayer_pat: the bayer pattern on the isp video sink pad
> * @quantization: the quantization configured on the isp's src pad
> * @ycbcr_encoding: the ycbcr_encoding configured on the isp's src pad
>+ *
>+ * This function is called by the ISP entity just before the ISP gets started.
>+ * It applies the initial ISP parameters from the first params buffer, but
>+ * skips LSC as it needs to be configured after the ISP is started.
> */
>-void rkisp1_params_configure(struct rkisp1_params *params,
>- enum rkisp1_fmt_raw_pat_type bayer_pat,
>- enum v4l2_quantization quantization,
>- enum v4l2_ycbcr_encoding ycbcr_encoding);
>+void rkisp1_params_pre_configure(struct rkisp1_params *params,
>+ enum rkisp1_fmt_raw_pat_type bayer_pat,
>+ enum v4l2_quantization quantization,
>+ enum v4l2_ycbcr_encoding ycbcr_encoding);
>+
>+/*
>+ * rkisp1_params_post_configure - Configure the params after stream start
>+ *
>+ * @params: pointer to rkisp1_params
>+ *
>+ * This function is called by the ISP entity just after the ISP gets started.
>+ * It applies the initial ISP LSC parameters from the first params buffer.
>+ */
>+void rkisp1_params_post_configure(struct rkisp1_params *params);
>
> /* rkisp1_params_disable - disable all parameters.
> * This function is called by the isp entity upon stream start
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>index 20c01e0e2e17..81a8fe66f5a7 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>@@ -343,9 +343,9 @@ static int rkisp1_config_isp(struct rkisp1_isp *isp,
> src_frm = rkisp1_isp_get_pad_fmt(isp, NULL,
> RKISP1_ISP_PAD_SOURCE_VIDEO,
> V4L2_SUBDEV_FORMAT_ACTIVE);
>- rkisp1_params_configure(&rkisp1->params, sink_fmt->bayer_pat,
>- src_frm->quantization,
>- src_frm->ycbcr_enc);
>+ rkisp1_params_pre_configure(&rkisp1->params, sink_fmt->bayer_pat,
>+ src_frm->quantization,
>+ src_frm->ycbcr_enc);
> }
>
> return 0;
>@@ -462,6 +462,9 @@ static int rkisp1_isp_start(struct rkisp1_isp *isp, struct media_pad *source)
> RKISP1_CIF_ISP_CTRL_ISP_INFORM_ENABLE;
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
>
>+ if (isp->src_fmt->pixel_enc == V4L2_PIXEL_ENC_BAYER)
>+ rkisp1_params_post_configure(&rkisp1->params);
hi,
I see that the pre-configure is actually called when format is not bayer.
Thanks,
Dafna
>+
> return 0;
> }
>
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>index 123c26fc1679..d8731ebbf479 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>@@ -1297,22 +1297,6 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
> RKISP1_CIF_ISP_CTRL_ISP_GAMMA_IN_ENA);
> }
>
>- /* update lsc config */
>- if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
>- rkisp1_lsc_config(params,
>- &new_params->others.lsc_config);
>-
>- if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
>- if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
>- rkisp1_param_set_bits(params,
>- RKISP1_CIF_ISP_LSC_CTRL,
>- RKISP1_CIF_ISP_LSC_CTRL_ENA);
>- else
>- rkisp1_param_clear_bits(params,
>- RKISP1_CIF_ISP_LSC_CTRL,
>- RKISP1_CIF_ISP_LSC_CTRL_ENA);
>- }
>-
> /* update awb gains */
> if (module_cfg_update & RKISP1_CIF_ISP_MODULE_AWB_GAIN)
> params->ops->awb_gain_config(params, &new_params->others.awb_gain_config);
>@@ -1429,6 +1413,33 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
> }
> }
>
>+static void
>+rkisp1_isp_isr_lsc_config(struct rkisp1_params *params,
>+ const struct rkisp1_params_cfg *new_params)
>+{
>+ unsigned int module_en_update, module_cfg_update, module_ens;
>+
>+ module_en_update = new_params->module_en_update;
>+ module_cfg_update = new_params->module_cfg_update;
>+ module_ens = new_params->module_ens;
>+
>+ /* update lsc config */
>+ if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
>+ rkisp1_lsc_config(params,
>+ &new_params->others.lsc_config);
>+
>+ if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
>+ if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
>+ rkisp1_param_set_bits(params,
>+ RKISP1_CIF_ISP_LSC_CTRL,
>+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
>+ else
>+ rkisp1_param_clear_bits(params,
>+ RKISP1_CIF_ISP_LSC_CTRL,
>+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
>+ }
>+}
>+
> static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
> struct rkisp1_params_cfg *new_params)
> {
>@@ -1490,47 +1501,60 @@ static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
> }
> }
>
>-static void rkisp1_params_apply_params_cfg(struct rkisp1_params *params,
>- unsigned int frame_sequence)
>+static bool rkisp1_params_get_buffer(struct rkisp1_params *params,
>+ struct rkisp1_buffer **buf,
>+ struct rkisp1_params_cfg **cfg)
> {
>- struct rkisp1_params_cfg *new_params;
>- struct rkisp1_buffer *cur_buf = NULL;
>-
> if (list_empty(¶ms->params))
>- return;
>+ return false;
>
>- cur_buf = list_first_entry(¶ms->params,
>- struct rkisp1_buffer, queue);
>+ *buf = list_first_entry(¶ms->params, struct rkisp1_buffer, queue);
>+ *cfg = vb2_plane_vaddr(&(*buf)->vb.vb2_buf, 0);
>
>- new_params = (struct rkisp1_params_cfg *)vb2_plane_vaddr(&cur_buf->vb.vb2_buf, 0);
>+ return true;
>+}
>
>- rkisp1_isp_isr_other_config(params, new_params);
>- rkisp1_isp_isr_meas_config(params, new_params);
>+static void rkisp1_params_complete_buffer(struct rkisp1_params *params,
>+ struct rkisp1_buffer *buf,
>+ unsigned int frame_sequence)
>+{
>+ list_del(&buf->queue);
>
>- /* update shadow register immediately */
>- rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL, RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>-
>- list_del(&cur_buf->queue);
>-
>- cur_buf->vb.sequence = frame_sequence;
>- vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
>+ buf->vb.sequence = frame_sequence;
>+ vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
> }
>
> void rkisp1_params_isr(struct rkisp1_device *rkisp1)
> {
>- /*
>- * This isr is called when the ISR finishes processing a frame (RKISP1_CIF_ISP_FRAME).
>- * Configurations performed here will be applied on the next frame.
>- * Since frame_sequence is updated on the vertical sync signal, we should use
>- * frame_sequence + 1 here to indicate to userspace on which frame these parameters
>- * are being applied.
>- */
>- unsigned int frame_sequence = rkisp1->isp.frame_sequence + 1;
> struct rkisp1_params *params = &rkisp1->params;
>+ struct rkisp1_params_cfg *new_params;
>+ struct rkisp1_buffer *cur_buf;
>
> spin_lock(¶ms->config_lock);
>- rkisp1_params_apply_params_cfg(params, frame_sequence);
>
>+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>+ goto unlock;
>+
>+ rkisp1_isp_isr_other_config(params, new_params);
>+ rkisp1_isp_isr_lsc_config(params, new_params);
>+ rkisp1_isp_isr_meas_config(params, new_params);
>+
>+ /* update shadow register immediately */
>+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>+
>+ /*
>+ * This isr is called when the ISR finishes processing a frame
>+ * (RKISP1_CIF_ISP_FRAME). Configurations performed here will be
>+ * applied on the next frame. Since frame_sequence is updated on the
>+ * vertical sync signal, we should use frame_sequence + 1 here to
>+ * indicate to userspace on which frame these parameters are being
>+ * applied.
>+ */
>+ rkisp1_params_complete_buffer(params, cur_buf,
>+ rkisp1->isp.frame_sequence + 1);
>+
>+unlock:
> spin_unlock(¶ms->config_lock);
> }
>
>@@ -1573,9 +1597,18 @@ static const struct rkisp1_cif_isp_afc_config rkisp1_afc_params_default_config =
> 14
> };
>
>-static void rkisp1_params_config_parameter(struct rkisp1_params *params)
>+void rkisp1_params_pre_configure(struct rkisp1_params *params,
>+ enum rkisp1_fmt_raw_pat_type bayer_pat,
>+ enum v4l2_quantization quantization,
>+ enum v4l2_ycbcr_encoding ycbcr_encoding)
> {
> struct rkisp1_cif_isp_hst_config hst = rkisp1_hst_params_default_config;
>+ struct rkisp1_params_cfg *new_params;
>+ struct rkisp1_buffer *cur_buf;
>+
>+ params->quantization = quantization;
>+ params->ycbcr_encoding = ycbcr_encoding;
>+ params->raw_type = bayer_pat;
>
> params->ops->awb_meas_config(params, &rkisp1_awb_params_default_config);
> params->ops->awb_meas_enable(params, &rkisp1_awb_params_default_config,
>@@ -1599,20 +1632,50 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params)
> spin_lock_irq(¶ms->config_lock);
>
> /* apply the first buffer if there is one already */
>- rkisp1_params_apply_params_cfg(params, 0);
>
>+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>+ goto unlock;
>+
>+ rkisp1_isp_isr_other_config(params, new_params);
>+ rkisp1_isp_isr_meas_config(params, new_params);
>+
>+ /* update shadow register immediately */
>+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>+
>+unlock:
> spin_unlock_irq(¶ms->config_lock);
> }
>
>-void rkisp1_params_configure(struct rkisp1_params *params,
>- enum rkisp1_fmt_raw_pat_type bayer_pat,
>- enum v4l2_quantization quantization,
>- enum v4l2_ycbcr_encoding ycbcr_encoding)
>+void rkisp1_params_post_configure(struct rkisp1_params *params)
> {
>- params->quantization = quantization;
>- params->ycbcr_encoding = ycbcr_encoding;
>- params->raw_type = bayer_pat;
>- rkisp1_params_config_parameter(params);
>+ struct rkisp1_params_cfg *new_params;
>+ struct rkisp1_buffer *cur_buf;
>+
>+ spin_lock_irq(¶ms->config_lock);
>+
>+ /*
>+ * Apply LSC parameters from the first buffer (if any is already
>+ * available. This must be done after the ISP gets started in the
>+ * ISP8000Nano v18.02 (found in the i.MX8MP) as access to the LSC RAM
>+ * is gated by the ISP_CTRL.ISP_ENABLE bit. As this initialization
>+ * ordering doesn't affect other ISP versions negatively, do so
>+ * unconditionally.
>+ */
>+
>+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>+ goto unlock;
>+
>+ rkisp1_isp_isr_lsc_config(params, new_params);
>+
>+ /* update shadow register immediately */
>+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>+
>+ rkisp1_params_complete_buffer(params, cur_buf, 0);
>+
>+unlock:
>+ spin_unlock_irq(¶ms->config_lock);
> }
>
> /*
>--
>Regards,
>
>Laurent Pinchart
>
>
>_______________________________________________
>Linux-rockchip mailing list
>Linux-rockchip@lists.infradead.org
>http://lists.infradead.org/mailman/listinfo/linux-rockchip
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH v1.1 5/5] media: rkisp1: Configure LSC after enabling the ISP
@ 2022-09-03 3:09 ` Dafna Hirschfeld
0 siblings, 0 replies; 46+ messages in thread
From: Dafna Hirschfeld @ 2022-09-03 3:09 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, linux-rockchip, Heiko Stuebner, Florian Sylvestre,
Paul Elder
On 23.08.2022 20:21, Laurent Pinchart wrote:
>The ISP8000Nano v18.02 (found in the i.MX8MP) requires the ISP to be
>enabled (as indicated by the ISP_CTRL.ISP_ENABLE bit) to configure the
>lens shading table in internal RAM. The driver currently configures all
>ISP initial parameters before enabling the ISP, which causes the LSC RAM
>to not be initialized properly.
>
>To fix this, split the rkisp1_params_configure() function into a
>rkisp1_params_pre_configure() and a rkisp1_params_post_configure(). The
>former configures all ISP parameters but LSC, while the latter
>configures LSC. To implement this, the rkisp1_params_apply_params_cfg()
>function is deconstructed, with two small helpers created to deal with
>the parameters buffers, which are then used in rkisp1_params_isr(),
>rkisp1_params_pre_configure() and rkisp1_params_post_configure().
>
>While this initialization ordering is only needed for the ISP8000Nano
>v18.02, it doesn't affect other ISP versions negatively, and can thus be
>followed unconditionally.
>
>Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>---
>Changes since v1:
>
>- Fix typo
>---
> .../platform/rockchip/rkisp1/rkisp1-common.h | 29 ++-
> .../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
> .../platform/rockchip/rkisp1/rkisp1-params.c | 169 ++++++++++++------
> 3 files changed, 143 insertions(+), 64 deletions(-)
>
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>index 1383c13e22b8..8b317060ab97 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>@@ -589,19 +589,32 @@ void rkisp1_sd_adjust_crop(struct v4l2_rect *crop,
> */
> const struct rkisp1_mbus_info *rkisp1_mbus_info_get_by_code(u32 mbus_code);
>
>-/* rkisp1_params_configure - configure the params when stream starts.
>- * This function is called by the isp entity upon stream starts.
>- * The function applies the initial configuration of the parameters.
>+/*
>+ * rkisp1_params_pre_configure - Configure the params before stream start
> *
>- * @params: pointer to rkisp1_params.
>+ * @params: pointer to rkisp1_params
> * @bayer_pat: the bayer pattern on the isp video sink pad
> * @quantization: the quantization configured on the isp's src pad
> * @ycbcr_encoding: the ycbcr_encoding configured on the isp's src pad
>+ *
>+ * This function is called by the ISP entity just before the ISP gets started.
>+ * It applies the initial ISP parameters from the first params buffer, but
>+ * skips LSC as it needs to be configured after the ISP is started.
> */
>-void rkisp1_params_configure(struct rkisp1_params *params,
>- enum rkisp1_fmt_raw_pat_type bayer_pat,
>- enum v4l2_quantization quantization,
>- enum v4l2_ycbcr_encoding ycbcr_encoding);
>+void rkisp1_params_pre_configure(struct rkisp1_params *params,
>+ enum rkisp1_fmt_raw_pat_type bayer_pat,
>+ enum v4l2_quantization quantization,
>+ enum v4l2_ycbcr_encoding ycbcr_encoding);
>+
>+/*
>+ * rkisp1_params_post_configure - Configure the params after stream start
>+ *
>+ * @params: pointer to rkisp1_params
>+ *
>+ * This function is called by the ISP entity just after the ISP gets started.
>+ * It applies the initial ISP LSC parameters from the first params buffer.
>+ */
>+void rkisp1_params_post_configure(struct rkisp1_params *params);
>
> /* rkisp1_params_disable - disable all parameters.
> * This function is called by the isp entity upon stream start
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>index 20c01e0e2e17..81a8fe66f5a7 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>@@ -343,9 +343,9 @@ static int rkisp1_config_isp(struct rkisp1_isp *isp,
> src_frm = rkisp1_isp_get_pad_fmt(isp, NULL,
> RKISP1_ISP_PAD_SOURCE_VIDEO,
> V4L2_SUBDEV_FORMAT_ACTIVE);
>- rkisp1_params_configure(&rkisp1->params, sink_fmt->bayer_pat,
>- src_frm->quantization,
>- src_frm->ycbcr_enc);
>+ rkisp1_params_pre_configure(&rkisp1->params, sink_fmt->bayer_pat,
>+ src_frm->quantization,
>+ src_frm->ycbcr_enc);
> }
>
> return 0;
>@@ -462,6 +462,9 @@ static int rkisp1_isp_start(struct rkisp1_isp *isp, struct media_pad *source)
> RKISP1_CIF_ISP_CTRL_ISP_INFORM_ENABLE;
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
>
>+ if (isp->src_fmt->pixel_enc == V4L2_PIXEL_ENC_BAYER)
>+ rkisp1_params_post_configure(&rkisp1->params);
hi,
I see that the pre-configure is actually called when format is not bayer.
Thanks,
Dafna
>+
> return 0;
> }
>
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>index 123c26fc1679..d8731ebbf479 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>@@ -1297,22 +1297,6 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
> RKISP1_CIF_ISP_CTRL_ISP_GAMMA_IN_ENA);
> }
>
>- /* update lsc config */
>- if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
>- rkisp1_lsc_config(params,
>- &new_params->others.lsc_config);
>-
>- if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
>- if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
>- rkisp1_param_set_bits(params,
>- RKISP1_CIF_ISP_LSC_CTRL,
>- RKISP1_CIF_ISP_LSC_CTRL_ENA);
>- else
>- rkisp1_param_clear_bits(params,
>- RKISP1_CIF_ISP_LSC_CTRL,
>- RKISP1_CIF_ISP_LSC_CTRL_ENA);
>- }
>-
> /* update awb gains */
> if (module_cfg_update & RKISP1_CIF_ISP_MODULE_AWB_GAIN)
> params->ops->awb_gain_config(params, &new_params->others.awb_gain_config);
>@@ -1429,6 +1413,33 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
> }
> }
>
>+static void
>+rkisp1_isp_isr_lsc_config(struct rkisp1_params *params,
>+ const struct rkisp1_params_cfg *new_params)
>+{
>+ unsigned int module_en_update, module_cfg_update, module_ens;
>+
>+ module_en_update = new_params->module_en_update;
>+ module_cfg_update = new_params->module_cfg_update;
>+ module_ens = new_params->module_ens;
>+
>+ /* update lsc config */
>+ if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
>+ rkisp1_lsc_config(params,
>+ &new_params->others.lsc_config);
>+
>+ if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
>+ if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
>+ rkisp1_param_set_bits(params,
>+ RKISP1_CIF_ISP_LSC_CTRL,
>+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
>+ else
>+ rkisp1_param_clear_bits(params,
>+ RKISP1_CIF_ISP_LSC_CTRL,
>+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
>+ }
>+}
>+
> static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
> struct rkisp1_params_cfg *new_params)
> {
>@@ -1490,47 +1501,60 @@ static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
> }
> }
>
>-static void rkisp1_params_apply_params_cfg(struct rkisp1_params *params,
>- unsigned int frame_sequence)
>+static bool rkisp1_params_get_buffer(struct rkisp1_params *params,
>+ struct rkisp1_buffer **buf,
>+ struct rkisp1_params_cfg **cfg)
> {
>- struct rkisp1_params_cfg *new_params;
>- struct rkisp1_buffer *cur_buf = NULL;
>-
> if (list_empty(¶ms->params))
>- return;
>+ return false;
>
>- cur_buf = list_first_entry(¶ms->params,
>- struct rkisp1_buffer, queue);
>+ *buf = list_first_entry(¶ms->params, struct rkisp1_buffer, queue);
>+ *cfg = vb2_plane_vaddr(&(*buf)->vb.vb2_buf, 0);
>
>- new_params = (struct rkisp1_params_cfg *)vb2_plane_vaddr(&cur_buf->vb.vb2_buf, 0);
>+ return true;
>+}
>
>- rkisp1_isp_isr_other_config(params, new_params);
>- rkisp1_isp_isr_meas_config(params, new_params);
>+static void rkisp1_params_complete_buffer(struct rkisp1_params *params,
>+ struct rkisp1_buffer *buf,
>+ unsigned int frame_sequence)
>+{
>+ list_del(&buf->queue);
>
>- /* update shadow register immediately */
>- rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL, RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>-
>- list_del(&cur_buf->queue);
>-
>- cur_buf->vb.sequence = frame_sequence;
>- vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
>+ buf->vb.sequence = frame_sequence;
>+ vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
> }
>
> void rkisp1_params_isr(struct rkisp1_device *rkisp1)
> {
>- /*
>- * This isr is called when the ISR finishes processing a frame (RKISP1_CIF_ISP_FRAME).
>- * Configurations performed here will be applied on the next frame.
>- * Since frame_sequence is updated on the vertical sync signal, we should use
>- * frame_sequence + 1 here to indicate to userspace on which frame these parameters
>- * are being applied.
>- */
>- unsigned int frame_sequence = rkisp1->isp.frame_sequence + 1;
> struct rkisp1_params *params = &rkisp1->params;
>+ struct rkisp1_params_cfg *new_params;
>+ struct rkisp1_buffer *cur_buf;
>
> spin_lock(¶ms->config_lock);
>- rkisp1_params_apply_params_cfg(params, frame_sequence);
>
>+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>+ goto unlock;
>+
>+ rkisp1_isp_isr_other_config(params, new_params);
>+ rkisp1_isp_isr_lsc_config(params, new_params);
>+ rkisp1_isp_isr_meas_config(params, new_params);
>+
>+ /* update shadow register immediately */
>+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>+
>+ /*
>+ * This isr is called when the ISR finishes processing a frame
>+ * (RKISP1_CIF_ISP_FRAME). Configurations performed here will be
>+ * applied on the next frame. Since frame_sequence is updated on the
>+ * vertical sync signal, we should use frame_sequence + 1 here to
>+ * indicate to userspace on which frame these parameters are being
>+ * applied.
>+ */
>+ rkisp1_params_complete_buffer(params, cur_buf,
>+ rkisp1->isp.frame_sequence + 1);
>+
>+unlock:
> spin_unlock(¶ms->config_lock);
> }
>
>@@ -1573,9 +1597,18 @@ static const struct rkisp1_cif_isp_afc_config rkisp1_afc_params_default_config =
> 14
> };
>
>-static void rkisp1_params_config_parameter(struct rkisp1_params *params)
>+void rkisp1_params_pre_configure(struct rkisp1_params *params,
>+ enum rkisp1_fmt_raw_pat_type bayer_pat,
>+ enum v4l2_quantization quantization,
>+ enum v4l2_ycbcr_encoding ycbcr_encoding)
> {
> struct rkisp1_cif_isp_hst_config hst = rkisp1_hst_params_default_config;
>+ struct rkisp1_params_cfg *new_params;
>+ struct rkisp1_buffer *cur_buf;
>+
>+ params->quantization = quantization;
>+ params->ycbcr_encoding = ycbcr_encoding;
>+ params->raw_type = bayer_pat;
>
> params->ops->awb_meas_config(params, &rkisp1_awb_params_default_config);
> params->ops->awb_meas_enable(params, &rkisp1_awb_params_default_config,
>@@ -1599,20 +1632,50 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params)
> spin_lock_irq(¶ms->config_lock);
>
> /* apply the first buffer if there is one already */
>- rkisp1_params_apply_params_cfg(params, 0);
>
>+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>+ goto unlock;
>+
>+ rkisp1_isp_isr_other_config(params, new_params);
>+ rkisp1_isp_isr_meas_config(params, new_params);
>+
>+ /* update shadow register immediately */
>+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>+
>+unlock:
> spin_unlock_irq(¶ms->config_lock);
> }
>
>-void rkisp1_params_configure(struct rkisp1_params *params,
>- enum rkisp1_fmt_raw_pat_type bayer_pat,
>- enum v4l2_quantization quantization,
>- enum v4l2_ycbcr_encoding ycbcr_encoding)
>+void rkisp1_params_post_configure(struct rkisp1_params *params)
> {
>- params->quantization = quantization;
>- params->ycbcr_encoding = ycbcr_encoding;
>- params->raw_type = bayer_pat;
>- rkisp1_params_config_parameter(params);
>+ struct rkisp1_params_cfg *new_params;
>+ struct rkisp1_buffer *cur_buf;
>+
>+ spin_lock_irq(¶ms->config_lock);
>+
>+ /*
>+ * Apply LSC parameters from the first buffer (if any is already
>+ * available. This must be done after the ISP gets started in the
>+ * ISP8000Nano v18.02 (found in the i.MX8MP) as access to the LSC RAM
>+ * is gated by the ISP_CTRL.ISP_ENABLE bit. As this initialization
>+ * ordering doesn't affect other ISP versions negatively, do so
>+ * unconditionally.
>+ */
>+
>+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>+ goto unlock;
>+
>+ rkisp1_isp_isr_lsc_config(params, new_params);
>+
>+ /* update shadow register immediately */
>+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>+
>+ rkisp1_params_complete_buffer(params, cur_buf, 0);
>+
>+unlock:
>+ spin_unlock_irq(¶ms->config_lock);
> }
>
> /*
>--
>Regards,
>
>Laurent Pinchart
>
>
>_______________________________________________
>Linux-rockchip mailing list
>Linux-rockchip@lists.infradead.org
>http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH v1.1 5/5] media: rkisp1: Configure LSC after enabling the ISP
2022-09-03 3:09 ` Dafna Hirschfeld
@ 2022-09-03 20:39 ` Laurent Pinchart
-1 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-09-03 20:39 UTC (permalink / raw)
To: Dafna Hirschfeld
Cc: linux-media, linux-rockchip, Heiko Stuebner, Florian Sylvestre,
Paul Elder
Hi Dafna,
On Sat, Sep 03, 2022 at 06:09:42AM +0300, Dafna Hirschfeld wrote:
> On 23.08.2022 20:21, Laurent Pinchart wrote:
> > The ISP8000Nano v18.02 (found in the i.MX8MP) requires the ISP to be
> > enabled (as indicated by the ISP_CTRL.ISP_ENABLE bit) to configure the
> > lens shading table in internal RAM. The driver currently configures all
> > ISP initial parameters before enabling the ISP, which causes the LSC RAM
> > to not be initialized properly.
> >
> > To fix this, split the rkisp1_params_configure() function into a
> > rkisp1_params_pre_configure() and a rkisp1_params_post_configure(). The
> > former configures all ISP parameters but LSC, while the latter
> > configures LSC. To implement this, the rkisp1_params_apply_params_cfg()
> > function is deconstructed, with two small helpers created to deal with
> > the parameters buffers, which are then used in rkisp1_params_isr(),
> > rkisp1_params_pre_configure() and rkisp1_params_post_configure().
> >
> > While this initialization ordering is only needed for the ISP8000Nano
> > v18.02, it doesn't affect other ISP versions negatively, and can thus be
> > followed unconditionally.
> >
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > ---
> > Changes since v1:
> >
> > - Fix typo
> > ---
> > .../platform/rockchip/rkisp1/rkisp1-common.h | 29 ++-
> > .../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
> > .../platform/rockchip/rkisp1/rkisp1-params.c | 169 ++++++++++++------
> > 3 files changed, 143 insertions(+), 64 deletions(-)
> >
> > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
> > index 1383c13e22b8..8b317060ab97 100644
> > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
> > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
> > @@ -589,19 +589,32 @@ void rkisp1_sd_adjust_crop(struct v4l2_rect *crop,
> > */
> > const struct rkisp1_mbus_info *rkisp1_mbus_info_get_by_code(u32 mbus_code);
> >
> > -/* rkisp1_params_configure - configure the params when stream starts.
> > - * This function is called by the isp entity upon stream starts.
> > - * The function applies the initial configuration of the parameters.
> > +/*
> > + * rkisp1_params_pre_configure - Configure the params before stream start
> > *
> > - * @params: pointer to rkisp1_params.
> > + * @params: pointer to rkisp1_params
> > * @bayer_pat: the bayer pattern on the isp video sink pad
> > * @quantization: the quantization configured on the isp's src pad
> > * @ycbcr_encoding: the ycbcr_encoding configured on the isp's src pad
> > + *
> > + * This function is called by the ISP entity just before the ISP gets started.
> > + * It applies the initial ISP parameters from the first params buffer, but
> > + * skips LSC as it needs to be configured after the ISP is started.
> > */
> > -void rkisp1_params_configure(struct rkisp1_params *params,
> > - enum rkisp1_fmt_raw_pat_type bayer_pat,
> > - enum v4l2_quantization quantization,
> > - enum v4l2_ycbcr_encoding ycbcr_encoding);
> > +void rkisp1_params_pre_configure(struct rkisp1_params *params,
> > + enum rkisp1_fmt_raw_pat_type bayer_pat,
> > + enum v4l2_quantization quantization,
> > + enum v4l2_ycbcr_encoding ycbcr_encoding);
> > +
> > +/*
> > + * rkisp1_params_post_configure - Configure the params after stream start
> > + *
> > + * @params: pointer to rkisp1_params
> > + *
> > + * This function is called by the ISP entity just after the ISP gets started.
> > + * It applies the initial ISP LSC parameters from the first params buffer.
> > + */
> > +void rkisp1_params_post_configure(struct rkisp1_params *params);
> >
> > /* rkisp1_params_disable - disable all parameters.
> > * This function is called by the isp entity upon stream start
> > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> > index 20c01e0e2e17..81a8fe66f5a7 100644
> > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> > @@ -343,9 +343,9 @@ static int rkisp1_config_isp(struct rkisp1_isp *isp,
> > src_frm = rkisp1_isp_get_pad_fmt(isp, NULL,
> > RKISP1_ISP_PAD_SOURCE_VIDEO,
> > V4L2_SUBDEV_FORMAT_ACTIVE);
> > - rkisp1_params_configure(&rkisp1->params, sink_fmt->bayer_pat,
> > - src_frm->quantization,
> > - src_frm->ycbcr_enc);
> > + rkisp1_params_pre_configure(&rkisp1->params, sink_fmt->bayer_pat,
> > + src_frm->quantization,
> > + src_frm->ycbcr_enc);
> > }
> >
> > return 0;
> > @@ -462,6 +462,9 @@ static int rkisp1_isp_start(struct rkisp1_isp *isp, struct media_pad *source)
> > RKISP1_CIF_ISP_CTRL_ISP_INFORM_ENABLE;
> > rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
> >
> > + if (isp->src_fmt->pixel_enc == V4L2_PIXEL_ENC_BAYER)
> > + rkisp1_params_post_configure(&rkisp1->params);
>
> hi,
> I see that the pre-configure is actually called when format is not bayer.
You're absolutely right. It ended up working by chance. I'll replace ==
with != in v1.2.
> > +
> > return 0;
> > }
> >
> > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> > index 123c26fc1679..d8731ebbf479 100644
> > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> > @@ -1297,22 +1297,6 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
> > RKISP1_CIF_ISP_CTRL_ISP_GAMMA_IN_ENA);
> > }
> >
> > - /* update lsc config */
> > - if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
> > - rkisp1_lsc_config(params,
> > - &new_params->others.lsc_config);
> > -
> > - if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
> > - if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
> > - rkisp1_param_set_bits(params,
> > - RKISP1_CIF_ISP_LSC_CTRL,
> > - RKISP1_CIF_ISP_LSC_CTRL_ENA);
> > - else
> > - rkisp1_param_clear_bits(params,
> > - RKISP1_CIF_ISP_LSC_CTRL,
> > - RKISP1_CIF_ISP_LSC_CTRL_ENA);
> > - }
> > -
> > /* update awb gains */
> > if (module_cfg_update & RKISP1_CIF_ISP_MODULE_AWB_GAIN)
> > params->ops->awb_gain_config(params, &new_params->others.awb_gain_config);
> > @@ -1429,6 +1413,33 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
> > }
> > }
> >
> > +static void
> > +rkisp1_isp_isr_lsc_config(struct rkisp1_params *params,
> > + const struct rkisp1_params_cfg *new_params)
> > +{
> > + unsigned int module_en_update, module_cfg_update, module_ens;
> > +
> > + module_en_update = new_params->module_en_update;
> > + module_cfg_update = new_params->module_cfg_update;
> > + module_ens = new_params->module_ens;
> > +
> > + /* update lsc config */
> > + if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
> > + rkisp1_lsc_config(params,
> > + &new_params->others.lsc_config);
> > +
> > + if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
> > + if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
> > + rkisp1_param_set_bits(params,
> > + RKISP1_CIF_ISP_LSC_CTRL,
> > + RKISP1_CIF_ISP_LSC_CTRL_ENA);
> > + else
> > + rkisp1_param_clear_bits(params,
> > + RKISP1_CIF_ISP_LSC_CTRL,
> > + RKISP1_CIF_ISP_LSC_CTRL_ENA);
> > + }
> > +}
> > +
> > static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
> > struct rkisp1_params_cfg *new_params)
> > {
> > @@ -1490,47 +1501,60 @@ static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
> > }
> > }
> >
> > -static void rkisp1_params_apply_params_cfg(struct rkisp1_params *params,
> > - unsigned int frame_sequence)
> > +static bool rkisp1_params_get_buffer(struct rkisp1_params *params,
> > + struct rkisp1_buffer **buf,
> > + struct rkisp1_params_cfg **cfg)
> > {
> > - struct rkisp1_params_cfg *new_params;
> > - struct rkisp1_buffer *cur_buf = NULL;
> > -
> > if (list_empty(¶ms->params))
> > - return;
> > + return false;
> >
> > - cur_buf = list_first_entry(¶ms->params,
> > - struct rkisp1_buffer, queue);
> > + *buf = list_first_entry(¶ms->params, struct rkisp1_buffer, queue);
> > + *cfg = vb2_plane_vaddr(&(*buf)->vb.vb2_buf, 0);
> >
> > - new_params = (struct rkisp1_params_cfg *)vb2_plane_vaddr(&cur_buf->vb.vb2_buf, 0);
> > + return true;
> > +}
> >
> > - rkisp1_isp_isr_other_config(params, new_params);
> > - rkisp1_isp_isr_meas_config(params, new_params);
> > +static void rkisp1_params_complete_buffer(struct rkisp1_params *params,
> > + struct rkisp1_buffer *buf,
> > + unsigned int frame_sequence)
> > +{
> > + list_del(&buf->queue);
> >
> > - /* update shadow register immediately */
> > - rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL, RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
> > -
> > - list_del(&cur_buf->queue);
> > -
> > - cur_buf->vb.sequence = frame_sequence;
> > - vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
> > + buf->vb.sequence = frame_sequence;
> > + vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
> > }
> >
> > void rkisp1_params_isr(struct rkisp1_device *rkisp1)
> > {
> > - /*
> > - * This isr is called when the ISR finishes processing a frame (RKISP1_CIF_ISP_FRAME).
> > - * Configurations performed here will be applied on the next frame.
> > - * Since frame_sequence is updated on the vertical sync signal, we should use
> > - * frame_sequence + 1 here to indicate to userspace on which frame these parameters
> > - * are being applied.
> > - */
> > - unsigned int frame_sequence = rkisp1->isp.frame_sequence + 1;
> > struct rkisp1_params *params = &rkisp1->params;
> > + struct rkisp1_params_cfg *new_params;
> > + struct rkisp1_buffer *cur_buf;
> >
> > spin_lock(¶ms->config_lock);
> > - rkisp1_params_apply_params_cfg(params, frame_sequence);
> >
> > + if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
> > + goto unlock;
> > +
> > + rkisp1_isp_isr_other_config(params, new_params);
> > + rkisp1_isp_isr_lsc_config(params, new_params);
> > + rkisp1_isp_isr_meas_config(params, new_params);
> > +
> > + /* update shadow register immediately */
> > + rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
> > + RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
> > +
> > + /*
> > + * This isr is called when the ISR finishes processing a frame
> > + * (RKISP1_CIF_ISP_FRAME). Configurations performed here will be
> > + * applied on the next frame. Since frame_sequence is updated on the
> > + * vertical sync signal, we should use frame_sequence + 1 here to
> > + * indicate to userspace on which frame these parameters are being
> > + * applied.
> > + */
> > + rkisp1_params_complete_buffer(params, cur_buf,
> > + rkisp1->isp.frame_sequence + 1);
> > +
> > +unlock:
> > spin_unlock(¶ms->config_lock);
> > }
> >
> > @@ -1573,9 +1597,18 @@ static const struct rkisp1_cif_isp_afc_config rkisp1_afc_params_default_config =
> > 14
> > };
> >
> > -static void rkisp1_params_config_parameter(struct rkisp1_params *params)
> > +void rkisp1_params_pre_configure(struct rkisp1_params *params,
> > + enum rkisp1_fmt_raw_pat_type bayer_pat,
> > + enum v4l2_quantization quantization,
> > + enum v4l2_ycbcr_encoding ycbcr_encoding)
> > {
> > struct rkisp1_cif_isp_hst_config hst = rkisp1_hst_params_default_config;
> > + struct rkisp1_params_cfg *new_params;
> > + struct rkisp1_buffer *cur_buf;
> > +
> > + params->quantization = quantization;
> > + params->ycbcr_encoding = ycbcr_encoding;
> > + params->raw_type = bayer_pat;
> >
> > params->ops->awb_meas_config(params, &rkisp1_awb_params_default_config);
> > params->ops->awb_meas_enable(params, &rkisp1_awb_params_default_config,
> > @@ -1599,20 +1632,50 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params)
> > spin_lock_irq(¶ms->config_lock);
> >
> > /* apply the first buffer if there is one already */
> > - rkisp1_params_apply_params_cfg(params, 0);
> >
> > + if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
> > + goto unlock;
> > +
> > + rkisp1_isp_isr_other_config(params, new_params);
> > + rkisp1_isp_isr_meas_config(params, new_params);
> > +
> > + /* update shadow register immediately */
> > + rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
> > + RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
> > +
> > +unlock:
> > spin_unlock_irq(¶ms->config_lock);
> > }
> >
> > -void rkisp1_params_configure(struct rkisp1_params *params,
> > - enum rkisp1_fmt_raw_pat_type bayer_pat,
> > - enum v4l2_quantization quantization,
> > - enum v4l2_ycbcr_encoding ycbcr_encoding)
> > +void rkisp1_params_post_configure(struct rkisp1_params *params)
> > {
> > - params->quantization = quantization;
> > - params->ycbcr_encoding = ycbcr_encoding;
> > - params->raw_type = bayer_pat;
> > - rkisp1_params_config_parameter(params);
> > + struct rkisp1_params_cfg *new_params;
> > + struct rkisp1_buffer *cur_buf;
> > +
> > + spin_lock_irq(¶ms->config_lock);
> > +
> > + /*
> > + * Apply LSC parameters from the first buffer (if any is already
> > + * available. This must be done after the ISP gets started in the
> > + * ISP8000Nano v18.02 (found in the i.MX8MP) as access to the LSC RAM
> > + * is gated by the ISP_CTRL.ISP_ENABLE bit. As this initialization
> > + * ordering doesn't affect other ISP versions negatively, do so
> > + * unconditionally.
> > + */
> > +
> > + if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
> > + goto unlock;
> > +
> > + rkisp1_isp_isr_lsc_config(params, new_params);
> > +
> > + /* update shadow register immediately */
> > + rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
> > + RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
> > +
> > + rkisp1_params_complete_buffer(params, cur_buf, 0);
> > +
> > +unlock:
> > + spin_unlock_irq(¶ms->config_lock);
> > }
> >
> > /*
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH v1.1 5/5] media: rkisp1: Configure LSC after enabling the ISP
@ 2022-09-03 20:39 ` Laurent Pinchart
0 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-09-03 20:39 UTC (permalink / raw)
To: Dafna Hirschfeld
Cc: linux-media, linux-rockchip, Heiko Stuebner, Florian Sylvestre,
Paul Elder
Hi Dafna,
On Sat, Sep 03, 2022 at 06:09:42AM +0300, Dafna Hirschfeld wrote:
> On 23.08.2022 20:21, Laurent Pinchart wrote:
> > The ISP8000Nano v18.02 (found in the i.MX8MP) requires the ISP to be
> > enabled (as indicated by the ISP_CTRL.ISP_ENABLE bit) to configure the
> > lens shading table in internal RAM. The driver currently configures all
> > ISP initial parameters before enabling the ISP, which causes the LSC RAM
> > to not be initialized properly.
> >
> > To fix this, split the rkisp1_params_configure() function into a
> > rkisp1_params_pre_configure() and a rkisp1_params_post_configure(). The
> > former configures all ISP parameters but LSC, while the latter
> > configures LSC. To implement this, the rkisp1_params_apply_params_cfg()
> > function is deconstructed, with two small helpers created to deal with
> > the parameters buffers, which are then used in rkisp1_params_isr(),
> > rkisp1_params_pre_configure() and rkisp1_params_post_configure().
> >
> > While this initialization ordering is only needed for the ISP8000Nano
> > v18.02, it doesn't affect other ISP versions negatively, and can thus be
> > followed unconditionally.
> >
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > ---
> > Changes since v1:
> >
> > - Fix typo
> > ---
> > .../platform/rockchip/rkisp1/rkisp1-common.h | 29 ++-
> > .../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
> > .../platform/rockchip/rkisp1/rkisp1-params.c | 169 ++++++++++++------
> > 3 files changed, 143 insertions(+), 64 deletions(-)
> >
> > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
> > index 1383c13e22b8..8b317060ab97 100644
> > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
> > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
> > @@ -589,19 +589,32 @@ void rkisp1_sd_adjust_crop(struct v4l2_rect *crop,
> > */
> > const struct rkisp1_mbus_info *rkisp1_mbus_info_get_by_code(u32 mbus_code);
> >
> > -/* rkisp1_params_configure - configure the params when stream starts.
> > - * This function is called by the isp entity upon stream starts.
> > - * The function applies the initial configuration of the parameters.
> > +/*
> > + * rkisp1_params_pre_configure - Configure the params before stream start
> > *
> > - * @params: pointer to rkisp1_params.
> > + * @params: pointer to rkisp1_params
> > * @bayer_pat: the bayer pattern on the isp video sink pad
> > * @quantization: the quantization configured on the isp's src pad
> > * @ycbcr_encoding: the ycbcr_encoding configured on the isp's src pad
> > + *
> > + * This function is called by the ISP entity just before the ISP gets started.
> > + * It applies the initial ISP parameters from the first params buffer, but
> > + * skips LSC as it needs to be configured after the ISP is started.
> > */
> > -void rkisp1_params_configure(struct rkisp1_params *params,
> > - enum rkisp1_fmt_raw_pat_type bayer_pat,
> > - enum v4l2_quantization quantization,
> > - enum v4l2_ycbcr_encoding ycbcr_encoding);
> > +void rkisp1_params_pre_configure(struct rkisp1_params *params,
> > + enum rkisp1_fmt_raw_pat_type bayer_pat,
> > + enum v4l2_quantization quantization,
> > + enum v4l2_ycbcr_encoding ycbcr_encoding);
> > +
> > +/*
> > + * rkisp1_params_post_configure - Configure the params after stream start
> > + *
> > + * @params: pointer to rkisp1_params
> > + *
> > + * This function is called by the ISP entity just after the ISP gets started.
> > + * It applies the initial ISP LSC parameters from the first params buffer.
> > + */
> > +void rkisp1_params_post_configure(struct rkisp1_params *params);
> >
> > /* rkisp1_params_disable - disable all parameters.
> > * This function is called by the isp entity upon stream start
> > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> > index 20c01e0e2e17..81a8fe66f5a7 100644
> > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> > @@ -343,9 +343,9 @@ static int rkisp1_config_isp(struct rkisp1_isp *isp,
> > src_frm = rkisp1_isp_get_pad_fmt(isp, NULL,
> > RKISP1_ISP_PAD_SOURCE_VIDEO,
> > V4L2_SUBDEV_FORMAT_ACTIVE);
> > - rkisp1_params_configure(&rkisp1->params, sink_fmt->bayer_pat,
> > - src_frm->quantization,
> > - src_frm->ycbcr_enc);
> > + rkisp1_params_pre_configure(&rkisp1->params, sink_fmt->bayer_pat,
> > + src_frm->quantization,
> > + src_frm->ycbcr_enc);
> > }
> >
> > return 0;
> > @@ -462,6 +462,9 @@ static int rkisp1_isp_start(struct rkisp1_isp *isp, struct media_pad *source)
> > RKISP1_CIF_ISP_CTRL_ISP_INFORM_ENABLE;
> > rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
> >
> > + if (isp->src_fmt->pixel_enc == V4L2_PIXEL_ENC_BAYER)
> > + rkisp1_params_post_configure(&rkisp1->params);
>
> hi,
> I see that the pre-configure is actually called when format is not bayer.
You're absolutely right. It ended up working by chance. I'll replace ==
with != in v1.2.
> > +
> > return 0;
> > }
> >
> > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> > index 123c26fc1679..d8731ebbf479 100644
> > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> > @@ -1297,22 +1297,6 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
> > RKISP1_CIF_ISP_CTRL_ISP_GAMMA_IN_ENA);
> > }
> >
> > - /* update lsc config */
> > - if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
> > - rkisp1_lsc_config(params,
> > - &new_params->others.lsc_config);
> > -
> > - if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
> > - if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
> > - rkisp1_param_set_bits(params,
> > - RKISP1_CIF_ISP_LSC_CTRL,
> > - RKISP1_CIF_ISP_LSC_CTRL_ENA);
> > - else
> > - rkisp1_param_clear_bits(params,
> > - RKISP1_CIF_ISP_LSC_CTRL,
> > - RKISP1_CIF_ISP_LSC_CTRL_ENA);
> > - }
> > -
> > /* update awb gains */
> > if (module_cfg_update & RKISP1_CIF_ISP_MODULE_AWB_GAIN)
> > params->ops->awb_gain_config(params, &new_params->others.awb_gain_config);
> > @@ -1429,6 +1413,33 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
> > }
> > }
> >
> > +static void
> > +rkisp1_isp_isr_lsc_config(struct rkisp1_params *params,
> > + const struct rkisp1_params_cfg *new_params)
> > +{
> > + unsigned int module_en_update, module_cfg_update, module_ens;
> > +
> > + module_en_update = new_params->module_en_update;
> > + module_cfg_update = new_params->module_cfg_update;
> > + module_ens = new_params->module_ens;
> > +
> > + /* update lsc config */
> > + if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
> > + rkisp1_lsc_config(params,
> > + &new_params->others.lsc_config);
> > +
> > + if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
> > + if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
> > + rkisp1_param_set_bits(params,
> > + RKISP1_CIF_ISP_LSC_CTRL,
> > + RKISP1_CIF_ISP_LSC_CTRL_ENA);
> > + else
> > + rkisp1_param_clear_bits(params,
> > + RKISP1_CIF_ISP_LSC_CTRL,
> > + RKISP1_CIF_ISP_LSC_CTRL_ENA);
> > + }
> > +}
> > +
> > static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
> > struct rkisp1_params_cfg *new_params)
> > {
> > @@ -1490,47 +1501,60 @@ static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
> > }
> > }
> >
> > -static void rkisp1_params_apply_params_cfg(struct rkisp1_params *params,
> > - unsigned int frame_sequence)
> > +static bool rkisp1_params_get_buffer(struct rkisp1_params *params,
> > + struct rkisp1_buffer **buf,
> > + struct rkisp1_params_cfg **cfg)
> > {
> > - struct rkisp1_params_cfg *new_params;
> > - struct rkisp1_buffer *cur_buf = NULL;
> > -
> > if (list_empty(¶ms->params))
> > - return;
> > + return false;
> >
> > - cur_buf = list_first_entry(¶ms->params,
> > - struct rkisp1_buffer, queue);
> > + *buf = list_first_entry(¶ms->params, struct rkisp1_buffer, queue);
> > + *cfg = vb2_plane_vaddr(&(*buf)->vb.vb2_buf, 0);
> >
> > - new_params = (struct rkisp1_params_cfg *)vb2_plane_vaddr(&cur_buf->vb.vb2_buf, 0);
> > + return true;
> > +}
> >
> > - rkisp1_isp_isr_other_config(params, new_params);
> > - rkisp1_isp_isr_meas_config(params, new_params);
> > +static void rkisp1_params_complete_buffer(struct rkisp1_params *params,
> > + struct rkisp1_buffer *buf,
> > + unsigned int frame_sequence)
> > +{
> > + list_del(&buf->queue);
> >
> > - /* update shadow register immediately */
> > - rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL, RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
> > -
> > - list_del(&cur_buf->queue);
> > -
> > - cur_buf->vb.sequence = frame_sequence;
> > - vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
> > + buf->vb.sequence = frame_sequence;
> > + vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
> > }
> >
> > void rkisp1_params_isr(struct rkisp1_device *rkisp1)
> > {
> > - /*
> > - * This isr is called when the ISR finishes processing a frame (RKISP1_CIF_ISP_FRAME).
> > - * Configurations performed here will be applied on the next frame.
> > - * Since frame_sequence is updated on the vertical sync signal, we should use
> > - * frame_sequence + 1 here to indicate to userspace on which frame these parameters
> > - * are being applied.
> > - */
> > - unsigned int frame_sequence = rkisp1->isp.frame_sequence + 1;
> > struct rkisp1_params *params = &rkisp1->params;
> > + struct rkisp1_params_cfg *new_params;
> > + struct rkisp1_buffer *cur_buf;
> >
> > spin_lock(¶ms->config_lock);
> > - rkisp1_params_apply_params_cfg(params, frame_sequence);
> >
> > + if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
> > + goto unlock;
> > +
> > + rkisp1_isp_isr_other_config(params, new_params);
> > + rkisp1_isp_isr_lsc_config(params, new_params);
> > + rkisp1_isp_isr_meas_config(params, new_params);
> > +
> > + /* update shadow register immediately */
> > + rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
> > + RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
> > +
> > + /*
> > + * This isr is called when the ISR finishes processing a frame
> > + * (RKISP1_CIF_ISP_FRAME). Configurations performed here will be
> > + * applied on the next frame. Since frame_sequence is updated on the
> > + * vertical sync signal, we should use frame_sequence + 1 here to
> > + * indicate to userspace on which frame these parameters are being
> > + * applied.
> > + */
> > + rkisp1_params_complete_buffer(params, cur_buf,
> > + rkisp1->isp.frame_sequence + 1);
> > +
> > +unlock:
> > spin_unlock(¶ms->config_lock);
> > }
> >
> > @@ -1573,9 +1597,18 @@ static const struct rkisp1_cif_isp_afc_config rkisp1_afc_params_default_config =
> > 14
> > };
> >
> > -static void rkisp1_params_config_parameter(struct rkisp1_params *params)
> > +void rkisp1_params_pre_configure(struct rkisp1_params *params,
> > + enum rkisp1_fmt_raw_pat_type bayer_pat,
> > + enum v4l2_quantization quantization,
> > + enum v4l2_ycbcr_encoding ycbcr_encoding)
> > {
> > struct rkisp1_cif_isp_hst_config hst = rkisp1_hst_params_default_config;
> > + struct rkisp1_params_cfg *new_params;
> > + struct rkisp1_buffer *cur_buf;
> > +
> > + params->quantization = quantization;
> > + params->ycbcr_encoding = ycbcr_encoding;
> > + params->raw_type = bayer_pat;
> >
> > params->ops->awb_meas_config(params, &rkisp1_awb_params_default_config);
> > params->ops->awb_meas_enable(params, &rkisp1_awb_params_default_config,
> > @@ -1599,20 +1632,50 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params)
> > spin_lock_irq(¶ms->config_lock);
> >
> > /* apply the first buffer if there is one already */
> > - rkisp1_params_apply_params_cfg(params, 0);
> >
> > + if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
> > + goto unlock;
> > +
> > + rkisp1_isp_isr_other_config(params, new_params);
> > + rkisp1_isp_isr_meas_config(params, new_params);
> > +
> > + /* update shadow register immediately */
> > + rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
> > + RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
> > +
> > +unlock:
> > spin_unlock_irq(¶ms->config_lock);
> > }
> >
> > -void rkisp1_params_configure(struct rkisp1_params *params,
> > - enum rkisp1_fmt_raw_pat_type bayer_pat,
> > - enum v4l2_quantization quantization,
> > - enum v4l2_ycbcr_encoding ycbcr_encoding)
> > +void rkisp1_params_post_configure(struct rkisp1_params *params)
> > {
> > - params->quantization = quantization;
> > - params->ycbcr_encoding = ycbcr_encoding;
> > - params->raw_type = bayer_pat;
> > - rkisp1_params_config_parameter(params);
> > + struct rkisp1_params_cfg *new_params;
> > + struct rkisp1_buffer *cur_buf;
> > +
> > + spin_lock_irq(¶ms->config_lock);
> > +
> > + /*
> > + * Apply LSC parameters from the first buffer (if any is already
> > + * available. This must be done after the ISP gets started in the
> > + * ISP8000Nano v18.02 (found in the i.MX8MP) as access to the LSC RAM
> > + * is gated by the ISP_CTRL.ISP_ENABLE bit. As this initialization
> > + * ordering doesn't affect other ISP versions negatively, do so
> > + * unconditionally.
> > + */
> > +
> > + if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
> > + goto unlock;
> > +
> > + rkisp1_isp_isr_lsc_config(params, new_params);
> > +
> > + /* update shadow register immediately */
> > + rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
> > + RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
> > +
> > + rkisp1_params_complete_buffer(params, cur_buf, 0);
> > +
> > +unlock:
> > + spin_unlock_irq(¶ms->config_lock);
> > }
> >
> > /*
--
Regards,
Laurent Pinchart
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH v1.2 5/5] media: rkisp1: Configure LSC after enabling the ISP
2022-08-23 17:21 ` Laurent Pinchart
@ 2022-09-03 21:01 ` Laurent Pinchart
-1 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-09-03 21:01 UTC (permalink / raw)
To: linux-media
Cc: linux-rockchip, Dafna Hirschfeld, Heiko Stuebner,
Florian Sylvestre, Paul Elder
The ISP8000Nano v18.02 (found in the i.MX8MP) requires the ISP to be
enabled (as indicated by the ISP_CTRL.ISP_ENABLE bit) to configure the
lens shading table in internal RAM. The driver currently configures all
ISP initial parameters before enabling the ISP, which causes the LSC RAM
to not be initialized properly.
To fix this, split the rkisp1_params_configure() function into a
rkisp1_params_pre_configure() and a rkisp1_params_post_configure(). The
former configures all ISP parameters but LSC, while the latter
configures LSC. To implement this, the rkisp1_params_apply_params_cfg()
function is deconstructed, with two small helpers created to deal with
the parameters buffers, which are then used in rkisp1_params_isr(),
rkisp1_params_pre_configure() and rkisp1_params_post_configure().
While this initialization ordering is only needed for the ISP8000Nano
v18.02, it doesn't affect other ISP versions negatively, and can thus be
followed unconditionally.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
Changes since v1:
- Call post_configure for non-bayer output formats at start time
- Fix typo
---
.../platform/rockchip/rkisp1/rkisp1-common.h | 29 ++-
.../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
.../platform/rockchip/rkisp1/rkisp1-params.c | 169 ++++++++++++------
3 files changed, 143 insertions(+), 64 deletions(-)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
index b704e955cb28..a1293c45aae1 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
@@ -557,19 +557,32 @@ void rkisp1_sd_adjust_crop(struct v4l2_rect *crop,
*/
const struct rkisp1_mbus_info *rkisp1_mbus_info_get_by_code(u32 mbus_code);
-/* rkisp1_params_configure - configure the params when stream starts.
- * This function is called by the isp entity upon stream starts.
- * The function applies the initial configuration of the parameters.
+/*
+ * rkisp1_params_pre_configure - Configure the params before stream start
*
- * @params: pointer to rkisp1_params.
+ * @params: pointer to rkisp1_params
* @bayer_pat: the bayer pattern on the isp video sink pad
* @quantization: the quantization configured on the isp's src pad
* @ycbcr_encoding: the ycbcr_encoding configured on the isp's src pad
+ *
+ * This function is called by the ISP entity just before the ISP gets started.
+ * It applies the initial ISP parameters from the first params buffer, but
+ * skips LSC as it needs to be configured after the ISP is started.
*/
-void rkisp1_params_configure(struct rkisp1_params *params,
- enum rkisp1_fmt_raw_pat_type bayer_pat,
- enum v4l2_quantization quantization,
- enum v4l2_ycbcr_encoding ycbcr_encoding);
+void rkisp1_params_pre_configure(struct rkisp1_params *params,
+ enum rkisp1_fmt_raw_pat_type bayer_pat,
+ enum v4l2_quantization quantization,
+ enum v4l2_ycbcr_encoding ycbcr_encoding);
+
+/*
+ * rkisp1_params_post_configure - Configure the params after stream start
+ *
+ * @params: pointer to rkisp1_params
+ *
+ * This function is called by the ISP entity just after the ISP gets started.
+ * It applies the initial ISP LSC parameters from the first params buffer.
+ */
+void rkisp1_params_post_configure(struct rkisp1_params *params);
/* rkisp1_params_disable - disable all parameters.
* This function is called by the isp entity upon stream start
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
index f19c0718963f..585cf3f53469 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
@@ -233,9 +233,9 @@ static int rkisp1_config_isp(struct rkisp1_isp *isp,
src_frm = rkisp1_isp_get_pad_fmt(isp, NULL,
RKISP1_ISP_PAD_SOURCE_VIDEO,
V4L2_SUBDEV_FORMAT_ACTIVE);
- rkisp1_params_configure(&rkisp1->params, sink_fmt->bayer_pat,
- src_frm->quantization,
- src_frm->ycbcr_enc);
+ rkisp1_params_pre_configure(&rkisp1->params, sink_fmt->bayer_pat,
+ src_frm->quantization,
+ src_frm->ycbcr_enc);
}
return 0;
@@ -341,6 +341,9 @@ static void rkisp1_isp_start(struct rkisp1_isp *isp)
RKISP1_CIF_ISP_CTRL_ISP_ENABLE |
RKISP1_CIF_ISP_CTRL_ISP_INFORM_ENABLE;
rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
+
+ if (isp->src_fmt->pixel_enc != V4L2_PIXEL_ENC_BAYER)
+ rkisp1_params_post_configure(&rkisp1->params);
}
/* ----------------------------------------------------------------------------
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
index 123c26fc1679..d8731ebbf479 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
@@ -1297,22 +1297,6 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
RKISP1_CIF_ISP_CTRL_ISP_GAMMA_IN_ENA);
}
- /* update lsc config */
- if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
- rkisp1_lsc_config(params,
- &new_params->others.lsc_config);
-
- if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
- if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
- rkisp1_param_set_bits(params,
- RKISP1_CIF_ISP_LSC_CTRL,
- RKISP1_CIF_ISP_LSC_CTRL_ENA);
- else
- rkisp1_param_clear_bits(params,
- RKISP1_CIF_ISP_LSC_CTRL,
- RKISP1_CIF_ISP_LSC_CTRL_ENA);
- }
-
/* update awb gains */
if (module_cfg_update & RKISP1_CIF_ISP_MODULE_AWB_GAIN)
params->ops->awb_gain_config(params, &new_params->others.awb_gain_config);
@@ -1429,6 +1413,33 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
}
}
+static void
+rkisp1_isp_isr_lsc_config(struct rkisp1_params *params,
+ const struct rkisp1_params_cfg *new_params)
+{
+ unsigned int module_en_update, module_cfg_update, module_ens;
+
+ module_en_update = new_params->module_en_update;
+ module_cfg_update = new_params->module_cfg_update;
+ module_ens = new_params->module_ens;
+
+ /* update lsc config */
+ if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
+ rkisp1_lsc_config(params,
+ &new_params->others.lsc_config);
+
+ if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
+ if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
+ rkisp1_param_set_bits(params,
+ RKISP1_CIF_ISP_LSC_CTRL,
+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
+ else
+ rkisp1_param_clear_bits(params,
+ RKISP1_CIF_ISP_LSC_CTRL,
+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
+ }
+}
+
static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
struct rkisp1_params_cfg *new_params)
{
@@ -1490,47 +1501,60 @@ static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
}
}
-static void rkisp1_params_apply_params_cfg(struct rkisp1_params *params,
- unsigned int frame_sequence)
+static bool rkisp1_params_get_buffer(struct rkisp1_params *params,
+ struct rkisp1_buffer **buf,
+ struct rkisp1_params_cfg **cfg)
{
- struct rkisp1_params_cfg *new_params;
- struct rkisp1_buffer *cur_buf = NULL;
-
if (list_empty(¶ms->params))
- return;
+ return false;
- cur_buf = list_first_entry(¶ms->params,
- struct rkisp1_buffer, queue);
+ *buf = list_first_entry(¶ms->params, struct rkisp1_buffer, queue);
+ *cfg = vb2_plane_vaddr(&(*buf)->vb.vb2_buf, 0);
- new_params = (struct rkisp1_params_cfg *)vb2_plane_vaddr(&cur_buf->vb.vb2_buf, 0);
+ return true;
+}
- rkisp1_isp_isr_other_config(params, new_params);
- rkisp1_isp_isr_meas_config(params, new_params);
+static void rkisp1_params_complete_buffer(struct rkisp1_params *params,
+ struct rkisp1_buffer *buf,
+ unsigned int frame_sequence)
+{
+ list_del(&buf->queue);
- /* update shadow register immediately */
- rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL, RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
-
- list_del(&cur_buf->queue);
-
- cur_buf->vb.sequence = frame_sequence;
- vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
+ buf->vb.sequence = frame_sequence;
+ vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
}
void rkisp1_params_isr(struct rkisp1_device *rkisp1)
{
- /*
- * This isr is called when the ISR finishes processing a frame (RKISP1_CIF_ISP_FRAME).
- * Configurations performed here will be applied on the next frame.
- * Since frame_sequence is updated on the vertical sync signal, we should use
- * frame_sequence + 1 here to indicate to userspace on which frame these parameters
- * are being applied.
- */
- unsigned int frame_sequence = rkisp1->isp.frame_sequence + 1;
struct rkisp1_params *params = &rkisp1->params;
+ struct rkisp1_params_cfg *new_params;
+ struct rkisp1_buffer *cur_buf;
spin_lock(¶ms->config_lock);
- rkisp1_params_apply_params_cfg(params, frame_sequence);
+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
+ goto unlock;
+
+ rkisp1_isp_isr_other_config(params, new_params);
+ rkisp1_isp_isr_lsc_config(params, new_params);
+ rkisp1_isp_isr_meas_config(params, new_params);
+
+ /* update shadow register immediately */
+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
+
+ /*
+ * This isr is called when the ISR finishes processing a frame
+ * (RKISP1_CIF_ISP_FRAME). Configurations performed here will be
+ * applied on the next frame. Since frame_sequence is updated on the
+ * vertical sync signal, we should use frame_sequence + 1 here to
+ * indicate to userspace on which frame these parameters are being
+ * applied.
+ */
+ rkisp1_params_complete_buffer(params, cur_buf,
+ rkisp1->isp.frame_sequence + 1);
+
+unlock:
spin_unlock(¶ms->config_lock);
}
@@ -1573,9 +1597,18 @@ static const struct rkisp1_cif_isp_afc_config rkisp1_afc_params_default_config =
14
};
-static void rkisp1_params_config_parameter(struct rkisp1_params *params)
+void rkisp1_params_pre_configure(struct rkisp1_params *params,
+ enum rkisp1_fmt_raw_pat_type bayer_pat,
+ enum v4l2_quantization quantization,
+ enum v4l2_ycbcr_encoding ycbcr_encoding)
{
struct rkisp1_cif_isp_hst_config hst = rkisp1_hst_params_default_config;
+ struct rkisp1_params_cfg *new_params;
+ struct rkisp1_buffer *cur_buf;
+
+ params->quantization = quantization;
+ params->ycbcr_encoding = ycbcr_encoding;
+ params->raw_type = bayer_pat;
params->ops->awb_meas_config(params, &rkisp1_awb_params_default_config);
params->ops->awb_meas_enable(params, &rkisp1_awb_params_default_config,
@@ -1599,20 +1632,50 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params)
spin_lock_irq(¶ms->config_lock);
/* apply the first buffer if there is one already */
- rkisp1_params_apply_params_cfg(params, 0);
+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
+ goto unlock;
+
+ rkisp1_isp_isr_other_config(params, new_params);
+ rkisp1_isp_isr_meas_config(params, new_params);
+
+ /* update shadow register immediately */
+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
+
+unlock:
spin_unlock_irq(¶ms->config_lock);
}
-void rkisp1_params_configure(struct rkisp1_params *params,
- enum rkisp1_fmt_raw_pat_type bayer_pat,
- enum v4l2_quantization quantization,
- enum v4l2_ycbcr_encoding ycbcr_encoding)
+void rkisp1_params_post_configure(struct rkisp1_params *params)
{
- params->quantization = quantization;
- params->ycbcr_encoding = ycbcr_encoding;
- params->raw_type = bayer_pat;
- rkisp1_params_config_parameter(params);
+ struct rkisp1_params_cfg *new_params;
+ struct rkisp1_buffer *cur_buf;
+
+ spin_lock_irq(¶ms->config_lock);
+
+ /*
+ * Apply LSC parameters from the first buffer (if any is already
+ * available. This must be done after the ISP gets started in the
+ * ISP8000Nano v18.02 (found in the i.MX8MP) as access to the LSC RAM
+ * is gated by the ISP_CTRL.ISP_ENABLE bit. As this initialization
+ * ordering doesn't affect other ISP versions negatively, do so
+ * unconditionally.
+ */
+
+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
+ goto unlock;
+
+ rkisp1_isp_isr_lsc_config(params, new_params);
+
+ /* update shadow register immediately */
+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
+
+ rkisp1_params_complete_buffer(params, cur_buf, 0);
+
+unlock:
+ spin_unlock_irq(¶ms->config_lock);
}
/*
--
Regards,
Laurent Pinchart
^ permalink raw reply related [flat|nested] 46+ messages in thread
* [PATCH v1.2 5/5] media: rkisp1: Configure LSC after enabling the ISP
@ 2022-09-03 21:01 ` Laurent Pinchart
0 siblings, 0 replies; 46+ messages in thread
From: Laurent Pinchart @ 2022-09-03 21:01 UTC (permalink / raw)
To: linux-media
Cc: linux-rockchip, Dafna Hirschfeld, Heiko Stuebner,
Florian Sylvestre, Paul Elder
The ISP8000Nano v18.02 (found in the i.MX8MP) requires the ISP to be
enabled (as indicated by the ISP_CTRL.ISP_ENABLE bit) to configure the
lens shading table in internal RAM. The driver currently configures all
ISP initial parameters before enabling the ISP, which causes the LSC RAM
to not be initialized properly.
To fix this, split the rkisp1_params_configure() function into a
rkisp1_params_pre_configure() and a rkisp1_params_post_configure(). The
former configures all ISP parameters but LSC, while the latter
configures LSC. To implement this, the rkisp1_params_apply_params_cfg()
function is deconstructed, with two small helpers created to deal with
the parameters buffers, which are then used in rkisp1_params_isr(),
rkisp1_params_pre_configure() and rkisp1_params_post_configure().
While this initialization ordering is only needed for the ISP8000Nano
v18.02, it doesn't affect other ISP versions negatively, and can thus be
followed unconditionally.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
Changes since v1:
- Call post_configure for non-bayer output formats at start time
- Fix typo
---
.../platform/rockchip/rkisp1/rkisp1-common.h | 29 ++-
.../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
.../platform/rockchip/rkisp1/rkisp1-params.c | 169 ++++++++++++------
3 files changed, 143 insertions(+), 64 deletions(-)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
index b704e955cb28..a1293c45aae1 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
@@ -557,19 +557,32 @@ void rkisp1_sd_adjust_crop(struct v4l2_rect *crop,
*/
const struct rkisp1_mbus_info *rkisp1_mbus_info_get_by_code(u32 mbus_code);
-/* rkisp1_params_configure - configure the params when stream starts.
- * This function is called by the isp entity upon stream starts.
- * The function applies the initial configuration of the parameters.
+/*
+ * rkisp1_params_pre_configure - Configure the params before stream start
*
- * @params: pointer to rkisp1_params.
+ * @params: pointer to rkisp1_params
* @bayer_pat: the bayer pattern on the isp video sink pad
* @quantization: the quantization configured on the isp's src pad
* @ycbcr_encoding: the ycbcr_encoding configured on the isp's src pad
+ *
+ * This function is called by the ISP entity just before the ISP gets started.
+ * It applies the initial ISP parameters from the first params buffer, but
+ * skips LSC as it needs to be configured after the ISP is started.
*/
-void rkisp1_params_configure(struct rkisp1_params *params,
- enum rkisp1_fmt_raw_pat_type bayer_pat,
- enum v4l2_quantization quantization,
- enum v4l2_ycbcr_encoding ycbcr_encoding);
+void rkisp1_params_pre_configure(struct rkisp1_params *params,
+ enum rkisp1_fmt_raw_pat_type bayer_pat,
+ enum v4l2_quantization quantization,
+ enum v4l2_ycbcr_encoding ycbcr_encoding);
+
+/*
+ * rkisp1_params_post_configure - Configure the params after stream start
+ *
+ * @params: pointer to rkisp1_params
+ *
+ * This function is called by the ISP entity just after the ISP gets started.
+ * It applies the initial ISP LSC parameters from the first params buffer.
+ */
+void rkisp1_params_post_configure(struct rkisp1_params *params);
/* rkisp1_params_disable - disable all parameters.
* This function is called by the isp entity upon stream start
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
index f19c0718963f..585cf3f53469 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
@@ -233,9 +233,9 @@ static int rkisp1_config_isp(struct rkisp1_isp *isp,
src_frm = rkisp1_isp_get_pad_fmt(isp, NULL,
RKISP1_ISP_PAD_SOURCE_VIDEO,
V4L2_SUBDEV_FORMAT_ACTIVE);
- rkisp1_params_configure(&rkisp1->params, sink_fmt->bayer_pat,
- src_frm->quantization,
- src_frm->ycbcr_enc);
+ rkisp1_params_pre_configure(&rkisp1->params, sink_fmt->bayer_pat,
+ src_frm->quantization,
+ src_frm->ycbcr_enc);
}
return 0;
@@ -341,6 +341,9 @@ static void rkisp1_isp_start(struct rkisp1_isp *isp)
RKISP1_CIF_ISP_CTRL_ISP_ENABLE |
RKISP1_CIF_ISP_CTRL_ISP_INFORM_ENABLE;
rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
+
+ if (isp->src_fmt->pixel_enc != V4L2_PIXEL_ENC_BAYER)
+ rkisp1_params_post_configure(&rkisp1->params);
}
/* ----------------------------------------------------------------------------
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
index 123c26fc1679..d8731ebbf479 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
@@ -1297,22 +1297,6 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
RKISP1_CIF_ISP_CTRL_ISP_GAMMA_IN_ENA);
}
- /* update lsc config */
- if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
- rkisp1_lsc_config(params,
- &new_params->others.lsc_config);
-
- if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
- if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
- rkisp1_param_set_bits(params,
- RKISP1_CIF_ISP_LSC_CTRL,
- RKISP1_CIF_ISP_LSC_CTRL_ENA);
- else
- rkisp1_param_clear_bits(params,
- RKISP1_CIF_ISP_LSC_CTRL,
- RKISP1_CIF_ISP_LSC_CTRL_ENA);
- }
-
/* update awb gains */
if (module_cfg_update & RKISP1_CIF_ISP_MODULE_AWB_GAIN)
params->ops->awb_gain_config(params, &new_params->others.awb_gain_config);
@@ -1429,6 +1413,33 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
}
}
+static void
+rkisp1_isp_isr_lsc_config(struct rkisp1_params *params,
+ const struct rkisp1_params_cfg *new_params)
+{
+ unsigned int module_en_update, module_cfg_update, module_ens;
+
+ module_en_update = new_params->module_en_update;
+ module_cfg_update = new_params->module_cfg_update;
+ module_ens = new_params->module_ens;
+
+ /* update lsc config */
+ if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
+ rkisp1_lsc_config(params,
+ &new_params->others.lsc_config);
+
+ if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
+ if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
+ rkisp1_param_set_bits(params,
+ RKISP1_CIF_ISP_LSC_CTRL,
+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
+ else
+ rkisp1_param_clear_bits(params,
+ RKISP1_CIF_ISP_LSC_CTRL,
+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
+ }
+}
+
static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
struct rkisp1_params_cfg *new_params)
{
@@ -1490,47 +1501,60 @@ static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
}
}
-static void rkisp1_params_apply_params_cfg(struct rkisp1_params *params,
- unsigned int frame_sequence)
+static bool rkisp1_params_get_buffer(struct rkisp1_params *params,
+ struct rkisp1_buffer **buf,
+ struct rkisp1_params_cfg **cfg)
{
- struct rkisp1_params_cfg *new_params;
- struct rkisp1_buffer *cur_buf = NULL;
-
if (list_empty(¶ms->params))
- return;
+ return false;
- cur_buf = list_first_entry(¶ms->params,
- struct rkisp1_buffer, queue);
+ *buf = list_first_entry(¶ms->params, struct rkisp1_buffer, queue);
+ *cfg = vb2_plane_vaddr(&(*buf)->vb.vb2_buf, 0);
- new_params = (struct rkisp1_params_cfg *)vb2_plane_vaddr(&cur_buf->vb.vb2_buf, 0);
+ return true;
+}
- rkisp1_isp_isr_other_config(params, new_params);
- rkisp1_isp_isr_meas_config(params, new_params);
+static void rkisp1_params_complete_buffer(struct rkisp1_params *params,
+ struct rkisp1_buffer *buf,
+ unsigned int frame_sequence)
+{
+ list_del(&buf->queue);
- /* update shadow register immediately */
- rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL, RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
-
- list_del(&cur_buf->queue);
-
- cur_buf->vb.sequence = frame_sequence;
- vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
+ buf->vb.sequence = frame_sequence;
+ vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
}
void rkisp1_params_isr(struct rkisp1_device *rkisp1)
{
- /*
- * This isr is called when the ISR finishes processing a frame (RKISP1_CIF_ISP_FRAME).
- * Configurations performed here will be applied on the next frame.
- * Since frame_sequence is updated on the vertical sync signal, we should use
- * frame_sequence + 1 here to indicate to userspace on which frame these parameters
- * are being applied.
- */
- unsigned int frame_sequence = rkisp1->isp.frame_sequence + 1;
struct rkisp1_params *params = &rkisp1->params;
+ struct rkisp1_params_cfg *new_params;
+ struct rkisp1_buffer *cur_buf;
spin_lock(¶ms->config_lock);
- rkisp1_params_apply_params_cfg(params, frame_sequence);
+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
+ goto unlock;
+
+ rkisp1_isp_isr_other_config(params, new_params);
+ rkisp1_isp_isr_lsc_config(params, new_params);
+ rkisp1_isp_isr_meas_config(params, new_params);
+
+ /* update shadow register immediately */
+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
+
+ /*
+ * This isr is called when the ISR finishes processing a frame
+ * (RKISP1_CIF_ISP_FRAME). Configurations performed here will be
+ * applied on the next frame. Since frame_sequence is updated on the
+ * vertical sync signal, we should use frame_sequence + 1 here to
+ * indicate to userspace on which frame these parameters are being
+ * applied.
+ */
+ rkisp1_params_complete_buffer(params, cur_buf,
+ rkisp1->isp.frame_sequence + 1);
+
+unlock:
spin_unlock(¶ms->config_lock);
}
@@ -1573,9 +1597,18 @@ static const struct rkisp1_cif_isp_afc_config rkisp1_afc_params_default_config =
14
};
-static void rkisp1_params_config_parameter(struct rkisp1_params *params)
+void rkisp1_params_pre_configure(struct rkisp1_params *params,
+ enum rkisp1_fmt_raw_pat_type bayer_pat,
+ enum v4l2_quantization quantization,
+ enum v4l2_ycbcr_encoding ycbcr_encoding)
{
struct rkisp1_cif_isp_hst_config hst = rkisp1_hst_params_default_config;
+ struct rkisp1_params_cfg *new_params;
+ struct rkisp1_buffer *cur_buf;
+
+ params->quantization = quantization;
+ params->ycbcr_encoding = ycbcr_encoding;
+ params->raw_type = bayer_pat;
params->ops->awb_meas_config(params, &rkisp1_awb_params_default_config);
params->ops->awb_meas_enable(params, &rkisp1_awb_params_default_config,
@@ -1599,20 +1632,50 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params)
spin_lock_irq(¶ms->config_lock);
/* apply the first buffer if there is one already */
- rkisp1_params_apply_params_cfg(params, 0);
+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
+ goto unlock;
+
+ rkisp1_isp_isr_other_config(params, new_params);
+ rkisp1_isp_isr_meas_config(params, new_params);
+
+ /* update shadow register immediately */
+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
+
+unlock:
spin_unlock_irq(¶ms->config_lock);
}
-void rkisp1_params_configure(struct rkisp1_params *params,
- enum rkisp1_fmt_raw_pat_type bayer_pat,
- enum v4l2_quantization quantization,
- enum v4l2_ycbcr_encoding ycbcr_encoding)
+void rkisp1_params_post_configure(struct rkisp1_params *params)
{
- params->quantization = quantization;
- params->ycbcr_encoding = ycbcr_encoding;
- params->raw_type = bayer_pat;
- rkisp1_params_config_parameter(params);
+ struct rkisp1_params_cfg *new_params;
+ struct rkisp1_buffer *cur_buf;
+
+ spin_lock_irq(¶ms->config_lock);
+
+ /*
+ * Apply LSC parameters from the first buffer (if any is already
+ * available. This must be done after the ISP gets started in the
+ * ISP8000Nano v18.02 (found in the i.MX8MP) as access to the LSC RAM
+ * is gated by the ISP_CTRL.ISP_ENABLE bit. As this initialization
+ * ordering doesn't affect other ISP versions negatively, do so
+ * unconditionally.
+ */
+
+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
+ goto unlock;
+
+ rkisp1_isp_isr_lsc_config(params, new_params);
+
+ /* update shadow register immediately */
+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
+
+ rkisp1_params_complete_buffer(params, cur_buf, 0);
+
+unlock:
+ spin_unlock_irq(¶ms->config_lock);
}
/*
--
Regards,
Laurent Pinchart
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 46+ messages in thread
* Re: [PATCH v1.2 5/5] media: rkisp1: Configure LSC after enabling the ISP
2022-09-03 21:01 ` Laurent Pinchart
@ 2022-09-04 13:12 ` Dafna Hirschfeld
-1 siblings, 0 replies; 46+ messages in thread
From: Dafna Hirschfeld @ 2022-09-04 13:12 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, linux-rockchip, Heiko Stuebner, Florian Sylvestre,
Paul Elder
On 04.09.2022 00:01, Laurent Pinchart wrote:
>The ISP8000Nano v18.02 (found in the i.MX8MP) requires the ISP to be
>enabled (as indicated by the ISP_CTRL.ISP_ENABLE bit) to configure the
>lens shading table in internal RAM. The driver currently configures all
>ISP initial parameters before enabling the ISP, which causes the LSC RAM
>to not be initialized properly.
>
>To fix this, split the rkisp1_params_configure() function into a
>rkisp1_params_pre_configure() and a rkisp1_params_post_configure(). The
>former configures all ISP parameters but LSC, while the latter
>configures LSC. To implement this, the rkisp1_params_apply_params_cfg()
>function is deconstructed, with two small helpers created to deal with
>the parameters buffers, which are then used in rkisp1_params_isr(),
>rkisp1_params_pre_configure() and rkisp1_params_post_configure().
>
>While this initialization ordering is only needed for the ISP8000Nano
>v18.02, it doesn't affect other ISP versions negatively, and can thus be
>followed unconditionally.
>
>Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Dafna Hirschfeld <dafna@fastmail.com>
>---
>Changes since v1:
>
>- Call post_configure for non-bayer output formats at start time
>- Fix typo
>---
> .../platform/rockchip/rkisp1/rkisp1-common.h | 29 ++-
> .../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
> .../platform/rockchip/rkisp1/rkisp1-params.c | 169 ++++++++++++------
> 3 files changed, 143 insertions(+), 64 deletions(-)
>
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>index b704e955cb28..a1293c45aae1 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>@@ -557,19 +557,32 @@ void rkisp1_sd_adjust_crop(struct v4l2_rect *crop,
> */
> const struct rkisp1_mbus_info *rkisp1_mbus_info_get_by_code(u32 mbus_code);
>
>-/* rkisp1_params_configure - configure the params when stream starts.
>- * This function is called by the isp entity upon stream starts.
>- * The function applies the initial configuration of the parameters.
>+/*
>+ * rkisp1_params_pre_configure - Configure the params before stream start
> *
>- * @params: pointer to rkisp1_params.
>+ * @params: pointer to rkisp1_params
> * @bayer_pat: the bayer pattern on the isp video sink pad
> * @quantization: the quantization configured on the isp's src pad
> * @ycbcr_encoding: the ycbcr_encoding configured on the isp's src pad
>+ *
>+ * This function is called by the ISP entity just before the ISP gets started.
>+ * It applies the initial ISP parameters from the first params buffer, but
>+ * skips LSC as it needs to be configured after the ISP is started.
> */
>-void rkisp1_params_configure(struct rkisp1_params *params,
>- enum rkisp1_fmt_raw_pat_type bayer_pat,
>- enum v4l2_quantization quantization,
>- enum v4l2_ycbcr_encoding ycbcr_encoding);
>+void rkisp1_params_pre_configure(struct rkisp1_params *params,
>+ enum rkisp1_fmt_raw_pat_type bayer_pat,
>+ enum v4l2_quantization quantization,
>+ enum v4l2_ycbcr_encoding ycbcr_encoding);
>+
>+/*
>+ * rkisp1_params_post_configure - Configure the params after stream start
>+ *
>+ * @params: pointer to rkisp1_params
>+ *
>+ * This function is called by the ISP entity just after the ISP gets started.
>+ * It applies the initial ISP LSC parameters from the first params buffer.
>+ */
>+void rkisp1_params_post_configure(struct rkisp1_params *params);
>
> /* rkisp1_params_disable - disable all parameters.
> * This function is called by the isp entity upon stream start
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>index f19c0718963f..585cf3f53469 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>@@ -233,9 +233,9 @@ static int rkisp1_config_isp(struct rkisp1_isp *isp,
> src_frm = rkisp1_isp_get_pad_fmt(isp, NULL,
> RKISP1_ISP_PAD_SOURCE_VIDEO,
> V4L2_SUBDEV_FORMAT_ACTIVE);
>- rkisp1_params_configure(&rkisp1->params, sink_fmt->bayer_pat,
>- src_frm->quantization,
>- src_frm->ycbcr_enc);
>+ rkisp1_params_pre_configure(&rkisp1->params, sink_fmt->bayer_pat,
>+ src_frm->quantization,
>+ src_frm->ycbcr_enc);
> }
>
> return 0;
>@@ -341,6 +341,9 @@ static void rkisp1_isp_start(struct rkisp1_isp *isp)
> RKISP1_CIF_ISP_CTRL_ISP_ENABLE |
> RKISP1_CIF_ISP_CTRL_ISP_INFORM_ENABLE;
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
>+
>+ if (isp->src_fmt->pixel_enc != V4L2_PIXEL_ENC_BAYER)
>+ rkisp1_params_post_configure(&rkisp1->params);
> }
>
> /* ----------------------------------------------------------------------------
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>index 123c26fc1679..d8731ebbf479 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>@@ -1297,22 +1297,6 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
> RKISP1_CIF_ISP_CTRL_ISP_GAMMA_IN_ENA);
> }
>
>- /* update lsc config */
>- if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
>- rkisp1_lsc_config(params,
>- &new_params->others.lsc_config);
>-
>- if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
>- if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
>- rkisp1_param_set_bits(params,
>- RKISP1_CIF_ISP_LSC_CTRL,
>- RKISP1_CIF_ISP_LSC_CTRL_ENA);
>- else
>- rkisp1_param_clear_bits(params,
>- RKISP1_CIF_ISP_LSC_CTRL,
>- RKISP1_CIF_ISP_LSC_CTRL_ENA);
>- }
>-
> /* update awb gains */
> if (module_cfg_update & RKISP1_CIF_ISP_MODULE_AWB_GAIN)
> params->ops->awb_gain_config(params, &new_params->others.awb_gain_config);
>@@ -1429,6 +1413,33 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
> }
> }
>
>+static void
>+rkisp1_isp_isr_lsc_config(struct rkisp1_params *params,
>+ const struct rkisp1_params_cfg *new_params)
>+{
>+ unsigned int module_en_update, module_cfg_update, module_ens;
>+
>+ module_en_update = new_params->module_en_update;
>+ module_cfg_update = new_params->module_cfg_update;
>+ module_ens = new_params->module_ens;
>+
>+ /* update lsc config */
>+ if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
>+ rkisp1_lsc_config(params,
>+ &new_params->others.lsc_config);
>+
>+ if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
>+ if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
>+ rkisp1_param_set_bits(params,
>+ RKISP1_CIF_ISP_LSC_CTRL,
>+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
>+ else
>+ rkisp1_param_clear_bits(params,
>+ RKISP1_CIF_ISP_LSC_CTRL,
>+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
>+ }
>+}
>+
> static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
> struct rkisp1_params_cfg *new_params)
> {
>@@ -1490,47 +1501,60 @@ static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
> }
> }
>
>-static void rkisp1_params_apply_params_cfg(struct rkisp1_params *params,
>- unsigned int frame_sequence)
>+static bool rkisp1_params_get_buffer(struct rkisp1_params *params,
>+ struct rkisp1_buffer **buf,
>+ struct rkisp1_params_cfg **cfg)
> {
>- struct rkisp1_params_cfg *new_params;
>- struct rkisp1_buffer *cur_buf = NULL;
>-
> if (list_empty(¶ms->params))
>- return;
>+ return false;
>
>- cur_buf = list_first_entry(¶ms->params,
>- struct rkisp1_buffer, queue);
>+ *buf = list_first_entry(¶ms->params, struct rkisp1_buffer, queue);
>+ *cfg = vb2_plane_vaddr(&(*buf)->vb.vb2_buf, 0);
>
>- new_params = (struct rkisp1_params_cfg *)vb2_plane_vaddr(&cur_buf->vb.vb2_buf, 0);
>+ return true;
>+}
>
>- rkisp1_isp_isr_other_config(params, new_params);
>- rkisp1_isp_isr_meas_config(params, new_params);
>+static void rkisp1_params_complete_buffer(struct rkisp1_params *params,
>+ struct rkisp1_buffer *buf,
>+ unsigned int frame_sequence)
>+{
>+ list_del(&buf->queue);
>
>- /* update shadow register immediately */
>- rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL, RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>-
>- list_del(&cur_buf->queue);
>-
>- cur_buf->vb.sequence = frame_sequence;
>- vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
>+ buf->vb.sequence = frame_sequence;
>+ vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
> }
>
> void rkisp1_params_isr(struct rkisp1_device *rkisp1)
> {
>- /*
>- * This isr is called when the ISR finishes processing a frame (RKISP1_CIF_ISP_FRAME).
>- * Configurations performed here will be applied on the next frame.
>- * Since frame_sequence is updated on the vertical sync signal, we should use
>- * frame_sequence + 1 here to indicate to userspace on which frame these parameters
>- * are being applied.
>- */
>- unsigned int frame_sequence = rkisp1->isp.frame_sequence + 1;
> struct rkisp1_params *params = &rkisp1->params;
>+ struct rkisp1_params_cfg *new_params;
>+ struct rkisp1_buffer *cur_buf;
>
> spin_lock(¶ms->config_lock);
>- rkisp1_params_apply_params_cfg(params, frame_sequence);
>
>+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>+ goto unlock;
>+
>+ rkisp1_isp_isr_other_config(params, new_params);
>+ rkisp1_isp_isr_lsc_config(params, new_params);
>+ rkisp1_isp_isr_meas_config(params, new_params);
>+
>+ /* update shadow register immediately */
>+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>+
>+ /*
>+ * This isr is called when the ISR finishes processing a frame
>+ * (RKISP1_CIF_ISP_FRAME). Configurations performed here will be
>+ * applied on the next frame. Since frame_sequence is updated on the
>+ * vertical sync signal, we should use frame_sequence + 1 here to
>+ * indicate to userspace on which frame these parameters are being
>+ * applied.
>+ */
>+ rkisp1_params_complete_buffer(params, cur_buf,
>+ rkisp1->isp.frame_sequence + 1);
>+
>+unlock:
> spin_unlock(¶ms->config_lock);
> }
>
>@@ -1573,9 +1597,18 @@ static const struct rkisp1_cif_isp_afc_config rkisp1_afc_params_default_config =
> 14
> };
>
>-static void rkisp1_params_config_parameter(struct rkisp1_params *params)
>+void rkisp1_params_pre_configure(struct rkisp1_params *params,
>+ enum rkisp1_fmt_raw_pat_type bayer_pat,
>+ enum v4l2_quantization quantization,
>+ enum v4l2_ycbcr_encoding ycbcr_encoding)
> {
> struct rkisp1_cif_isp_hst_config hst = rkisp1_hst_params_default_config;
>+ struct rkisp1_params_cfg *new_params;
>+ struct rkisp1_buffer *cur_buf;
>+
>+ params->quantization = quantization;
>+ params->ycbcr_encoding = ycbcr_encoding;
>+ params->raw_type = bayer_pat;
>
> params->ops->awb_meas_config(params, &rkisp1_awb_params_default_config);
> params->ops->awb_meas_enable(params, &rkisp1_awb_params_default_config,
>@@ -1599,20 +1632,50 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params)
> spin_lock_irq(¶ms->config_lock);
>
> /* apply the first buffer if there is one already */
>- rkisp1_params_apply_params_cfg(params, 0);
>
>+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>+ goto unlock;
>+
>+ rkisp1_isp_isr_other_config(params, new_params);
>+ rkisp1_isp_isr_meas_config(params, new_params);
>+
>+ /* update shadow register immediately */
>+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>+
>+unlock:
> spin_unlock_irq(¶ms->config_lock);
> }
>
>-void rkisp1_params_configure(struct rkisp1_params *params,
>- enum rkisp1_fmt_raw_pat_type bayer_pat,
>- enum v4l2_quantization quantization,
>- enum v4l2_ycbcr_encoding ycbcr_encoding)
>+void rkisp1_params_post_configure(struct rkisp1_params *params)
> {
>- params->quantization = quantization;
>- params->ycbcr_encoding = ycbcr_encoding;
>- params->raw_type = bayer_pat;
>- rkisp1_params_config_parameter(params);
>+ struct rkisp1_params_cfg *new_params;
>+ struct rkisp1_buffer *cur_buf;
>+
>+ spin_lock_irq(¶ms->config_lock);
>+
>+ /*
>+ * Apply LSC parameters from the first buffer (if any is already
>+ * available. This must be done after the ISP gets started in the
>+ * ISP8000Nano v18.02 (found in the i.MX8MP) as access to the LSC RAM
>+ * is gated by the ISP_CTRL.ISP_ENABLE bit. As this initialization
>+ * ordering doesn't affect other ISP versions negatively, do so
>+ * unconditionally.
>+ */
>+
>+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>+ goto unlock;
>+
>+ rkisp1_isp_isr_lsc_config(params, new_params);
>+
>+ /* update shadow register immediately */
>+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>+
>+ rkisp1_params_complete_buffer(params, cur_buf, 0);
>+
>+unlock:
>+ spin_unlock_irq(¶ms->config_lock);
> }
>
> /*
>--
>Regards,
>
>Laurent Pinchart
>
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH v1.2 5/5] media: rkisp1: Configure LSC after enabling the ISP
@ 2022-09-04 13:12 ` Dafna Hirschfeld
0 siblings, 0 replies; 46+ messages in thread
From: Dafna Hirschfeld @ 2022-09-04 13:12 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, linux-rockchip, Heiko Stuebner, Florian Sylvestre,
Paul Elder
On 04.09.2022 00:01, Laurent Pinchart wrote:
>The ISP8000Nano v18.02 (found in the i.MX8MP) requires the ISP to be
>enabled (as indicated by the ISP_CTRL.ISP_ENABLE bit) to configure the
>lens shading table in internal RAM. The driver currently configures all
>ISP initial parameters before enabling the ISP, which causes the LSC RAM
>to not be initialized properly.
>
>To fix this, split the rkisp1_params_configure() function into a
>rkisp1_params_pre_configure() and a rkisp1_params_post_configure(). The
>former configures all ISP parameters but LSC, while the latter
>configures LSC. To implement this, the rkisp1_params_apply_params_cfg()
>function is deconstructed, with two small helpers created to deal with
>the parameters buffers, which are then used in rkisp1_params_isr(),
>rkisp1_params_pre_configure() and rkisp1_params_post_configure().
>
>While this initialization ordering is only needed for the ISP8000Nano
>v18.02, it doesn't affect other ISP versions negatively, and can thus be
>followed unconditionally.
>
>Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Dafna Hirschfeld <dafna@fastmail.com>
>---
>Changes since v1:
>
>- Call post_configure for non-bayer output formats at start time
>- Fix typo
>---
> .../platform/rockchip/rkisp1/rkisp1-common.h | 29 ++-
> .../platform/rockchip/rkisp1/rkisp1-isp.c | 9 +-
> .../platform/rockchip/rkisp1/rkisp1-params.c | 169 ++++++++++++------
> 3 files changed, 143 insertions(+), 64 deletions(-)
>
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>index b704e955cb28..a1293c45aae1 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
>@@ -557,19 +557,32 @@ void rkisp1_sd_adjust_crop(struct v4l2_rect *crop,
> */
> const struct rkisp1_mbus_info *rkisp1_mbus_info_get_by_code(u32 mbus_code);
>
>-/* rkisp1_params_configure - configure the params when stream starts.
>- * This function is called by the isp entity upon stream starts.
>- * The function applies the initial configuration of the parameters.
>+/*
>+ * rkisp1_params_pre_configure - Configure the params before stream start
> *
>- * @params: pointer to rkisp1_params.
>+ * @params: pointer to rkisp1_params
> * @bayer_pat: the bayer pattern on the isp video sink pad
> * @quantization: the quantization configured on the isp's src pad
> * @ycbcr_encoding: the ycbcr_encoding configured on the isp's src pad
>+ *
>+ * This function is called by the ISP entity just before the ISP gets started.
>+ * It applies the initial ISP parameters from the first params buffer, but
>+ * skips LSC as it needs to be configured after the ISP is started.
> */
>-void rkisp1_params_configure(struct rkisp1_params *params,
>- enum rkisp1_fmt_raw_pat_type bayer_pat,
>- enum v4l2_quantization quantization,
>- enum v4l2_ycbcr_encoding ycbcr_encoding);
>+void rkisp1_params_pre_configure(struct rkisp1_params *params,
>+ enum rkisp1_fmt_raw_pat_type bayer_pat,
>+ enum v4l2_quantization quantization,
>+ enum v4l2_ycbcr_encoding ycbcr_encoding);
>+
>+/*
>+ * rkisp1_params_post_configure - Configure the params after stream start
>+ *
>+ * @params: pointer to rkisp1_params
>+ *
>+ * This function is called by the ISP entity just after the ISP gets started.
>+ * It applies the initial ISP LSC parameters from the first params buffer.
>+ */
>+void rkisp1_params_post_configure(struct rkisp1_params *params);
>
> /* rkisp1_params_disable - disable all parameters.
> * This function is called by the isp entity upon stream start
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>index f19c0718963f..585cf3f53469 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
>@@ -233,9 +233,9 @@ static int rkisp1_config_isp(struct rkisp1_isp *isp,
> src_frm = rkisp1_isp_get_pad_fmt(isp, NULL,
> RKISP1_ISP_PAD_SOURCE_VIDEO,
> V4L2_SUBDEV_FORMAT_ACTIVE);
>- rkisp1_params_configure(&rkisp1->params, sink_fmt->bayer_pat,
>- src_frm->quantization,
>- src_frm->ycbcr_enc);
>+ rkisp1_params_pre_configure(&rkisp1->params, sink_fmt->bayer_pat,
>+ src_frm->quantization,
>+ src_frm->ycbcr_enc);
> }
>
> return 0;
>@@ -341,6 +341,9 @@ static void rkisp1_isp_start(struct rkisp1_isp *isp)
> RKISP1_CIF_ISP_CTRL_ISP_ENABLE |
> RKISP1_CIF_ISP_CTRL_ISP_INFORM_ENABLE;
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
>+
>+ if (isp->src_fmt->pixel_enc != V4L2_PIXEL_ENC_BAYER)
>+ rkisp1_params_post_configure(&rkisp1->params);
> }
>
> /* ----------------------------------------------------------------------------
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>index 123c26fc1679..d8731ebbf479 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
>@@ -1297,22 +1297,6 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
> RKISP1_CIF_ISP_CTRL_ISP_GAMMA_IN_ENA);
> }
>
>- /* update lsc config */
>- if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
>- rkisp1_lsc_config(params,
>- &new_params->others.lsc_config);
>-
>- if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
>- if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
>- rkisp1_param_set_bits(params,
>- RKISP1_CIF_ISP_LSC_CTRL,
>- RKISP1_CIF_ISP_LSC_CTRL_ENA);
>- else
>- rkisp1_param_clear_bits(params,
>- RKISP1_CIF_ISP_LSC_CTRL,
>- RKISP1_CIF_ISP_LSC_CTRL_ENA);
>- }
>-
> /* update awb gains */
> if (module_cfg_update & RKISP1_CIF_ISP_MODULE_AWB_GAIN)
> params->ops->awb_gain_config(params, &new_params->others.awb_gain_config);
>@@ -1429,6 +1413,33 @@ rkisp1_isp_isr_other_config(struct rkisp1_params *params,
> }
> }
>
>+static void
>+rkisp1_isp_isr_lsc_config(struct rkisp1_params *params,
>+ const struct rkisp1_params_cfg *new_params)
>+{
>+ unsigned int module_en_update, module_cfg_update, module_ens;
>+
>+ module_en_update = new_params->module_en_update;
>+ module_cfg_update = new_params->module_cfg_update;
>+ module_ens = new_params->module_ens;
>+
>+ /* update lsc config */
>+ if (module_cfg_update & RKISP1_CIF_ISP_MODULE_LSC)
>+ rkisp1_lsc_config(params,
>+ &new_params->others.lsc_config);
>+
>+ if (module_en_update & RKISP1_CIF_ISP_MODULE_LSC) {
>+ if (module_ens & RKISP1_CIF_ISP_MODULE_LSC)
>+ rkisp1_param_set_bits(params,
>+ RKISP1_CIF_ISP_LSC_CTRL,
>+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
>+ else
>+ rkisp1_param_clear_bits(params,
>+ RKISP1_CIF_ISP_LSC_CTRL,
>+ RKISP1_CIF_ISP_LSC_CTRL_ENA);
>+ }
>+}
>+
> static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
> struct rkisp1_params_cfg *new_params)
> {
>@@ -1490,47 +1501,60 @@ static void rkisp1_isp_isr_meas_config(struct rkisp1_params *params,
> }
> }
>
>-static void rkisp1_params_apply_params_cfg(struct rkisp1_params *params,
>- unsigned int frame_sequence)
>+static bool rkisp1_params_get_buffer(struct rkisp1_params *params,
>+ struct rkisp1_buffer **buf,
>+ struct rkisp1_params_cfg **cfg)
> {
>- struct rkisp1_params_cfg *new_params;
>- struct rkisp1_buffer *cur_buf = NULL;
>-
> if (list_empty(¶ms->params))
>- return;
>+ return false;
>
>- cur_buf = list_first_entry(¶ms->params,
>- struct rkisp1_buffer, queue);
>+ *buf = list_first_entry(¶ms->params, struct rkisp1_buffer, queue);
>+ *cfg = vb2_plane_vaddr(&(*buf)->vb.vb2_buf, 0);
>
>- new_params = (struct rkisp1_params_cfg *)vb2_plane_vaddr(&cur_buf->vb.vb2_buf, 0);
>+ return true;
>+}
>
>- rkisp1_isp_isr_other_config(params, new_params);
>- rkisp1_isp_isr_meas_config(params, new_params);
>+static void rkisp1_params_complete_buffer(struct rkisp1_params *params,
>+ struct rkisp1_buffer *buf,
>+ unsigned int frame_sequence)
>+{
>+ list_del(&buf->queue);
>
>- /* update shadow register immediately */
>- rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL, RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>-
>- list_del(&cur_buf->queue);
>-
>- cur_buf->vb.sequence = frame_sequence;
>- vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
>+ buf->vb.sequence = frame_sequence;
>+ vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
> }
>
> void rkisp1_params_isr(struct rkisp1_device *rkisp1)
> {
>- /*
>- * This isr is called when the ISR finishes processing a frame (RKISP1_CIF_ISP_FRAME).
>- * Configurations performed here will be applied on the next frame.
>- * Since frame_sequence is updated on the vertical sync signal, we should use
>- * frame_sequence + 1 here to indicate to userspace on which frame these parameters
>- * are being applied.
>- */
>- unsigned int frame_sequence = rkisp1->isp.frame_sequence + 1;
> struct rkisp1_params *params = &rkisp1->params;
>+ struct rkisp1_params_cfg *new_params;
>+ struct rkisp1_buffer *cur_buf;
>
> spin_lock(¶ms->config_lock);
>- rkisp1_params_apply_params_cfg(params, frame_sequence);
>
>+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>+ goto unlock;
>+
>+ rkisp1_isp_isr_other_config(params, new_params);
>+ rkisp1_isp_isr_lsc_config(params, new_params);
>+ rkisp1_isp_isr_meas_config(params, new_params);
>+
>+ /* update shadow register immediately */
>+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>+
>+ /*
>+ * This isr is called when the ISR finishes processing a frame
>+ * (RKISP1_CIF_ISP_FRAME). Configurations performed here will be
>+ * applied on the next frame. Since frame_sequence is updated on the
>+ * vertical sync signal, we should use frame_sequence + 1 here to
>+ * indicate to userspace on which frame these parameters are being
>+ * applied.
>+ */
>+ rkisp1_params_complete_buffer(params, cur_buf,
>+ rkisp1->isp.frame_sequence + 1);
>+
>+unlock:
> spin_unlock(¶ms->config_lock);
> }
>
>@@ -1573,9 +1597,18 @@ static const struct rkisp1_cif_isp_afc_config rkisp1_afc_params_default_config =
> 14
> };
>
>-static void rkisp1_params_config_parameter(struct rkisp1_params *params)
>+void rkisp1_params_pre_configure(struct rkisp1_params *params,
>+ enum rkisp1_fmt_raw_pat_type bayer_pat,
>+ enum v4l2_quantization quantization,
>+ enum v4l2_ycbcr_encoding ycbcr_encoding)
> {
> struct rkisp1_cif_isp_hst_config hst = rkisp1_hst_params_default_config;
>+ struct rkisp1_params_cfg *new_params;
>+ struct rkisp1_buffer *cur_buf;
>+
>+ params->quantization = quantization;
>+ params->ycbcr_encoding = ycbcr_encoding;
>+ params->raw_type = bayer_pat;
>
> params->ops->awb_meas_config(params, &rkisp1_awb_params_default_config);
> params->ops->awb_meas_enable(params, &rkisp1_awb_params_default_config,
>@@ -1599,20 +1632,50 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params)
> spin_lock_irq(¶ms->config_lock);
>
> /* apply the first buffer if there is one already */
>- rkisp1_params_apply_params_cfg(params, 0);
>
>+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>+ goto unlock;
>+
>+ rkisp1_isp_isr_other_config(params, new_params);
>+ rkisp1_isp_isr_meas_config(params, new_params);
>+
>+ /* update shadow register immediately */
>+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>+
>+unlock:
> spin_unlock_irq(¶ms->config_lock);
> }
>
>-void rkisp1_params_configure(struct rkisp1_params *params,
>- enum rkisp1_fmt_raw_pat_type bayer_pat,
>- enum v4l2_quantization quantization,
>- enum v4l2_ycbcr_encoding ycbcr_encoding)
>+void rkisp1_params_post_configure(struct rkisp1_params *params)
> {
>- params->quantization = quantization;
>- params->ycbcr_encoding = ycbcr_encoding;
>- params->raw_type = bayer_pat;
>- rkisp1_params_config_parameter(params);
>+ struct rkisp1_params_cfg *new_params;
>+ struct rkisp1_buffer *cur_buf;
>+
>+ spin_lock_irq(¶ms->config_lock);
>+
>+ /*
>+ * Apply LSC parameters from the first buffer (if any is already
>+ * available. This must be done after the ISP gets started in the
>+ * ISP8000Nano v18.02 (found in the i.MX8MP) as access to the LSC RAM
>+ * is gated by the ISP_CTRL.ISP_ENABLE bit. As this initialization
>+ * ordering doesn't affect other ISP versions negatively, do so
>+ * unconditionally.
>+ */
>+
>+ if (!rkisp1_params_get_buffer(params, &cur_buf, &new_params))
>+ goto unlock;
>+
>+ rkisp1_isp_isr_lsc_config(params, new_params);
>+
>+ /* update shadow register immediately */
>+ rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL,
>+ RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
>+
>+ rkisp1_params_complete_buffer(params, cur_buf, 0);
>+
>+unlock:
>+ spin_unlock_irq(¶ms->config_lock);
> }
>
> /*
>--
>Regards,
>
>Laurent Pinchart
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 46+ messages in thread
end of thread, other threads:[~2022-09-04 13:13 UTC | newest]
Thread overview: 46+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-17 2:18 [PATCH 0/5] media: rkisp1: Fix LSC initial configuration on i.MX8MP Laurent Pinchart
2022-08-17 2:18 ` Laurent Pinchart
2022-08-17 2:18 ` [PATCH 1/5] media: rkisp1: Clean up LSC configuration code Laurent Pinchart
2022-08-17 2:18 ` Laurent Pinchart
2022-08-18 2:32 ` Dafna Hirschfeld
2022-08-18 2:32 ` Dafna Hirschfeld
2022-08-17 2:18 ` [PATCH 2/5] media: rkisp1: Store LSC register values in u32 variables Laurent Pinchart
2022-08-17 2:18 ` Laurent Pinchart
2022-08-18 2:37 ` Dafna Hirschfeld
2022-08-18 2:37 ` Dafna Hirschfeld
2022-08-17 2:18 ` [PATCH 3/5] media: rkisp1: Simplify LSC x/y size and grad register macros Laurent Pinchart
2022-08-17 2:18 ` Laurent Pinchart
2022-08-18 2:39 ` Dafna Hirschfeld
2022-08-18 2:39 ` Dafna Hirschfeld
2022-08-17 2:18 ` [PATCH 4/5] media: rkisp1: Use RKISP1_CIF_ISP_LSC_GRAD_SIZE() for gradient registers Laurent Pinchart
2022-08-17 2:18 ` Laurent Pinchart
2022-08-18 2:50 ` Dafna Hirschfeld
2022-08-18 2:50 ` Dafna Hirschfeld
2022-08-18 6:17 ` Laurent Pinchart
2022-08-18 6:17 ` Laurent Pinchart
2022-08-23 17:21 ` [PATCH v1.1 4/5] media: rkisp1: Use correct macro " Laurent Pinchart
2022-08-23 17:21 ` Laurent Pinchart
2022-08-26 19:06 ` Dafna Hirschfeld
2022-08-26 19:06 ` Dafna Hirschfeld
2022-08-17 2:18 ` [PATCH 5/5] media: rkisp1: Configure LSC after enabling the ISP Laurent Pinchart
2022-08-17 2:18 ` Laurent Pinchart
2022-08-18 3:45 ` Dafna Hirschfeld
2022-08-18 3:45 ` Dafna Hirschfeld
2022-08-18 6:25 ` Laurent Pinchart
2022-08-18 6:25 ` Laurent Pinchart
2022-08-22 17:08 ` Dafna Hirschfeld
2022-08-22 17:08 ` Dafna Hirschfeld
2022-08-23 17:21 ` [PATCH v1.1 " Laurent Pinchart
2022-08-23 17:21 ` Laurent Pinchart
2022-09-03 3:09 ` Dafna Hirschfeld
2022-09-03 3:09 ` Dafna Hirschfeld
2022-09-03 20:39 ` Laurent Pinchart
2022-09-03 20:39 ` Laurent Pinchart
2022-09-03 21:01 ` [PATCH v1.2 " Laurent Pinchart
2022-09-03 21:01 ` Laurent Pinchart
2022-09-04 13:12 ` Dafna Hirschfeld
2022-09-04 13:12 ` Dafna Hirschfeld
2022-09-02 9:07 ` [PATCH 0/5] media: rkisp1: Fix LSC initial configuration on i.MX8MP Dafna Hirschfeld
2022-09-02 9:07 ` Dafna Hirschfeld
2022-09-02 10:07 ` Laurent Pinchart
2022-09-02 10:07 ` Laurent Pinchart
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.