Skip to content

Commit a802a04

Browse files
Dafna Hirschfeldmchehab
authored andcommitted
media: rkisp1: stats: mask the hist_bins values
hist_bins is an array of type __u32. Each entry represents a 20 bit value. So mask out the unused bits. Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> Acked-by: Helen Koike <helen.koike@collabora.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
1 parent a76f8dc commit a802a04

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,7 @@
365365
#define RKISP1_CIF_ISP_MAX_HIST_PREDIVIDER 0x0000007F
366366
#define RKISP1_CIF_ISP_HIST_ROW_NUM 5
367367
#define RKISP1_CIF_ISP_HIST_COLUMN_NUM 5
368+
#define RKISP1_CIF_ISP_HIST_GET_BIN(x) ((x) & 0x000FFFFF)
368369

369370
/* AUTO FOCUS MEASUREMENT: ISP_AFM_CTRL */
370371
#define RKISP1_ISP_AFM_CTRL_ENABLE BIT(0)

drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,11 @@ static void rkisp1_stats_get_hst_meas(struct rkisp1_stats *stats,
233233
unsigned int i;
234234

235235
pbuf->meas_type |= RKISP1_CIF_ISP_STAT_HIST;
236-
for (i = 0; i < RKISP1_CIF_ISP_HIST_BIN_N_MAX; i++)
237-
pbuf->params.hist.hist_bins[i] =
238-
rkisp1_read(rkisp1, RKISP1_CIF_ISP_HIST_BIN_0 + i * 4);
236+
for (i = 0; i < RKISP1_CIF_ISP_HIST_BIN_N_MAX; i++) {
237+
u32 reg_val = rkisp1_read(rkisp1, RKISP1_CIF_ISP_HIST_BIN_0 + i * 4);
238+
239+
pbuf->params.hist.hist_bins[i] = RKISP1_CIF_ISP_HIST_GET_BIN(reg_val);
240+
}
239241
}
240242

241243
static void rkisp1_stats_get_bls_meas(struct rkisp1_stats *stats,

0 commit comments

Comments
 (0)