Commit 66d81de7 authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Mauro Carvalho Chehab

media: rockchip: rkisp1: reduce number of histogram grid elements in uapi

The uapi right now specifies an array size of 28 but the actual number
of elements is only 25 with the last 3 being unused.

Reduce the array size to the correct number of elements and change
the params code to iterate the array 25 times.
Signed-off-by: default avatarHeiko Stuebner <heiko.stuebner@theobroma-systems.com>
Signed-off-by: default avatarDafna Hirschfeld <dafna.hirschfeld@collabora.com>
Acked-by: default avatarHelen Koike <helen.koike@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent a802a043
...@@ -589,7 +589,6 @@ static void rkisp1_hst_config(struct rkisp1_params *params, ...@@ -589,7 +589,6 @@ static void rkisp1_hst_config(struct rkisp1_params *params,
RKISP1_CIF_ISP_HIST_WEIGHT_22TO03, RKISP1_CIF_ISP_HIST_WEIGHT_22TO03,
RKISP1_CIF_ISP_HIST_WEIGHT_13TO43, RKISP1_CIF_ISP_HIST_WEIGHT_13TO43,
RKISP1_CIF_ISP_HIST_WEIGHT_04TO34, RKISP1_CIF_ISP_HIST_WEIGHT_04TO34,
RKISP1_CIF_ISP_HIST_WEIGHT_44,
}; };
const u8 *weight; const u8 *weight;
unsigned int i; unsigned int i;
...@@ -622,6 +621,8 @@ static void rkisp1_hst_config(struct rkisp1_params *params, ...@@ -622,6 +621,8 @@ static void rkisp1_hst_config(struct rkisp1_params *params,
weight[2], weight[2],
weight[3]), weight[3]),
hist_weight_regs[i]); hist_weight_regs[i]);
rkisp1_write(params->rkisp1, weight[0] & 0x1F, RKISP1_CIF_ISP_HIST_WEIGHT_44);
} }
static void static void
......
...@@ -102,8 +102,7 @@ ...@@ -102,8 +102,7 @@
/* /*
* Histogram calculation * Histogram calculation
*/ */
/* Last 3 values unused. */ #define RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE 25
#define RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE 28
/* /*
* Defect Pixel Cluster Correction * Defect Pixel Cluster Correction
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment