Commit 3bf96b6e authored by Kate Hsuan's avatar Kate Hsuan Committed by Mauro Carvalho Chehab
Browse files

media: staging: media: ipu3: Fix AWB x_start position when rightmost stripe is used 



An not calibrated x_start setting would result in an incorrect AWB grid
configuration on a sensor when only the rightmost stripe is used.

If the AWB grid coordinate is set to the rightmost stripe, for example,
x_start is greater than 640, the AWB grid will be at the rightmost edge of
the sensor. The AWB statistic will be fetched from the wrong place of the
sensor and results in an incorrect AWB estimation result. Therefore,
stripe offset should subtract from x_start to have a correct grid
configuration for the rightmost stripe.

Signed-off-by: default avatarKate Hsuan <hpa@redhat.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 3c9b04d9

drivers/staging/media/ipu3/ipu3-css-params.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -2636,6 +2636,17 @@ int imgu_css_cfg_acc(struct imgu_css *css, unsigned int pipe, 
	    acc->stripe.down_scaled_stripes[1].offset + min_overlap) {

	    acc->stripe.down_scaled_stripes[1].offset + min_overlap) {

		/* Enable only for rightmost stripe, disable left */

		/* Enable only for rightmost stripe, disable left */

		acc->awb.stripes[0].rgbs_thr_b &= ~IPU3_UAPI_AWB_RGBS_THR_B_EN;

		acc->awb.stripes[0].rgbs_thr_b &= ~IPU3_UAPI_AWB_RGBS_THR_B_EN;



		acc->awb.stripes[1].grid.x_start =

			(acc->awb.stripes[1].grid.x_start -

			 acc->stripe.down_scaled_stripes[1].offset) &

			IPU3_UAPI_GRID_START_MASK;



		b_w_log2 = acc->awb.stripes[1].grid.block_width_log2;

		acc->awb.stripes[1].grid.x_end =

			imgu_css_grid_end(acc->awb.stripes[1].grid.x_start,

					  acc->awb.stripes[1].grid.width,

					  b_w_log2);

	} else if (acc->awb.config.grid.x_end <=

	} else if (acc->awb.config.grid.x_end <=

		   acc->stripe.bds_out_stripes[0].width - min_overlap) {

		   acc->stripe.bds_out_stripes[0].width - min_overlap) {

		/* Enable only for leftmost stripe, disable right */

		/* Enable only for leftmost stripe, disable right */