Hi Dafna,
Thanks for the patch.
On 5/14/20 11:21 AM, Dafna Hirschfeld wrote:
> When a size error is signaled, it is possible to read a register
> to see where the error comes from. So, in debugfs the general
> error 'pic_size_err' can be replaced with 3 more precise errors.
>
> Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@xxxxxxxxxxxxx>
> ---
> drivers/staging/media/rkisp1/rkisp1-common.h | 4 +++-
> drivers/staging/media/rkisp1/rkisp1-dev.c | 8 ++++++--
> drivers/staging/media/rkisp1/rkisp1-isp.c | 7 ++++++-
> 3 files changed, 15 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/media/rkisp1/rkisp1-common.h b/drivers/staging/media/rkisp1/rkisp1-common.h
> index 0c4fe503adc9..95d54306bae6 100644
> --- a/drivers/staging/media/rkisp1/rkisp1-common.h
> +++ b/drivers/staging/media/rkisp1/rkisp1-common.h
> @@ -226,7 +226,9 @@ struct rkisp1_resizer {
> struct rkisp1_debug {
> struct dentry *debugfs_dir;
> unsigned long data_loss;
> - unsigned long pic_size_error;
> + unsigned long outform_size_error;
> + unsigned long is_size_error;
I would just do s/is/img_stabilization
otherwise it is easy to read it as a verb, and it feels it's a boolean, and not a counter.
With this:
Acked-by: Helen Koike <helen.koike@xxxxxxxxxxxxx>
Regards,
Helen
> + unsigned long inform_size_error;
> unsigned long mipi_error;
> unsigned long stats_error;
> unsigned long stop_timeout[2];
> diff --git a/drivers/staging/media/rkisp1/rkisp1-dev.c b/drivers/staging/media/rkisp1/rkisp1-dev.c
> index 9ac38bafb839..2298d3ae5950 100644
> --- a/drivers/staging/media/rkisp1/rkisp1-dev.c
> +++ b/drivers/staging/media/rkisp1/rkisp1-dev.c
> @@ -438,8 +438,12 @@ static void rkisp1_debug_init(struct rkisp1_device *rkisp1)
> }
> debugfs_create_ulong("data_loss", 0444, debug->debugfs_dir,
> &debug->data_loss);
> - debugfs_create_ulong("pic_size_error", 0444, debug->debugfs_dir,
> - &debug->pic_size_error);
> + debugfs_create_ulong("outform_size_err", 0444, debug->debugfs_dir,
> + &debug->outform_size_error);
> + debugfs_create_ulong("is_size_error", 0444, debug->debugfs_dir,
> + &debug->is_size_error);
> + debugfs_create_ulong("inform_size_error", 0444, debug->debugfs_dir,
> + &debug->inform_size_error);
> debugfs_create_ulong("mipi_error", 0444, debug->debugfs_dir,
> &debug->mipi_error);
> debugfs_create_ulong("stats_error", 0444, debug->debugfs_dir,
> diff --git a/drivers/staging/media/rkisp1/rkisp1-isp.c b/drivers/staging/media/rkisp1/rkisp1-isp.c
> index dc2b59a0160a..a7e5461e25a5 100644
> --- a/drivers/staging/media/rkisp1/rkisp1-isp.c
> +++ b/drivers/staging/media/rkisp1/rkisp1-isp.c
> @@ -1123,8 +1123,13 @@ void rkisp1_isp_isr(struct rkisp1_device *rkisp1)
> if (status & RKISP1_CIF_ISP_PIC_SIZE_ERROR) {
> /* Clear pic_size_error */
> isp_err = rkisp1_read(rkisp1, RKISP1_CIF_ISP_ERR);
> + if (isp_err & RKISP1_CIF_ISP_ERR_INFORM_SIZE)
> + rkisp1->debug.inform_size_error++;
> + if (isp_err & RKISP1_CIF_ISP_ERR_IS_SIZE)
> + rkisp1->debug.is_size_error++;
> + if (isp_err & RKISP1_CIF_ISP_ERR_OUTFORM_SIZE)
> + rkisp1->debug.outform_size_error++;
> rkisp1_write(rkisp1, isp_err, RKISP1_CIF_ISP_ERR_CLR);
> - rkisp1->debug.pic_size_error++;
> } else if (status & RKISP1_CIF_ISP_DATA_LOSS) {
> /* keep track of data_loss in debugfs */
> rkisp1->debug.data_loss++;
>
