LinuxTV Patchwork [v2,3/4] media: atmel: atmel-isc: add support for DO_WHITE_BALANCE

login
register
mail settings
Submitter Eugen Hristev
Date April 15, 2019, 2:13 p.m.
Message ID <1555337305-13767-4-git-send-email-eugen.hristev@microchip.com>
Download mbox | patch
Permalink /patch/55682/
State New
Headers show

Comments

Eugen Hristev - April 15, 2019, 2:13 p.m.
From: Eugen Hristev <eugen.hristev@microchip.com>


This adds support for the 'button' control DO_WHITE_BALANCE
This feature will enable the ISC to compute the white balance coefficients
in a one time shot, at the user discretion.
This can be used if a color chart/grey chart is present in front of the camera.
The ISC will adjust the coefficients and have them fixed until next balance
or until sensor mode is changed.
This is particularly useful for white balance adjustment in different
lighting scenarios, and then taking photos to similar scenery.
The old auto white balance stays in place, where the ISC will adjust every
4 frames to the current scenery lighting, if the scenery is approximately
grey in average, otherwise grey world algorithm fails.
One time white balance adjustments needs streaming to be enabled, such that
capture is enabled and the histogram has data to work with.
Histogram without capture does not work in this hardware module.

To start the one time white balance procedure:
v4l2-ctl --set-ctrl=do_white_balance=1

This feature works only if the sensor is streaming RAW data, as the hardware
supports a histogram only for RAW bayer components.

If the auto white balance is enabled, do_white_balance does nothing.
If the streaming is disabled, or the sensor does not output RAW data, the
control is inactive.

User controls now include the do_white_balance ctrl:
User Controls

                     brightness 0x00980900 (int)    : min=-1024 max=1023 step=1 default=0 value=0 flags=slider
                       contrast 0x00980901 (int)    : min=-2048 max=2047 step=1 default=256 value=256 flags=slider
        white_balance_automatic 0x0098090c (bool)   : default=1 value=0
               do_white_balance 0x0098090d (button) : flags=write-only, execute-on-write
                          gamma 0x00980910 (int)    : min=0 max=2 step=1 default=2 value=2 flags=slider

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>

---
Changes in v2:
 - changed according to review by Hans: DO_WB works evne if AWB is enabled and
does nothing; use active/inactive on do_wb ctrl to make it inactive if
not streaming or not raw; do not do anything on inactive ctrls in ctrls
callback.

 drivers/media/platform/atmel/atmel-isc.c | 66 ++++++++++++++++++++++++++++----
 1 file changed, 59 insertions(+), 7 deletions(-)

-- 
2.7.4

Patch

diff --git a/drivers/media/platform/atmel/atmel-isc.c b/drivers/media/platform/atmel/atmel-isc.c

index 0ac5953..777e27f 100644

--- a/drivers/media/platform/atmel/atmel-isc.c

+++ b/drivers/media/platform/atmel/atmel-isc.c

@@ -167,6 +167,9 @@  struct isc_ctrls {

 	u32 brightness;
 	u32 contrast;
 	u8 gamma_index;
+#define ISC_WB_NONE	0

+#define ISC_WB_AUTO	1

+#define ISC_WB_ONETIME	2

 	u8 awb;
 
 	/* one for each component : GR, R, GB, B */
@@ -210,6 +213,7 @@  struct isc_device {

 	struct fmt_config	try_config;
 
 	struct isc_ctrls	ctrls;
+	struct v4l2_ctrl	*do_wb_ctrl;

 	struct work_struct	awb_work;
 
 	struct mutex		lock;
@@ -838,7 +842,7 @@  static void isc_set_pipeline(struct isc_device *isc, u32 pipeline)

 
 	bay_cfg = isc->config.sd_format->cfa_baycfg;
 
-	if (!ctrls->awb)

+	if (ctrls->awb == ISC_WB_NONE)

 		isc_reset_awb_ctrls(isc);
 
 	regmap_write(regmap, ISC_WB_CFG, bay_cfg);
@@ -993,6 +997,10 @@  static int isc_start_streaming(struct vb2_queue *vq, unsigned int count)

 
 	spin_unlock_irqrestore(&isc->dma_queue_lock, flags);
 
+	/* if we streaming from RAW, we can do one-shot white balance adj */

+	if (ISC_IS_FORMAT_RAW(isc->config.sd_format->mbus_code))

+		v4l2_ctrl_activate(isc->do_wb_ctrl, true);

+

 	return 0;
 
 err_configure:
@@ -1017,6 +1025,8 @@  static void isc_stop_streaming(struct vb2_queue *vq)

 	struct isc_buffer *buf;
 	int ret;
 
+	v4l2_ctrl_activate(isc->do_wb_ctrl, false);

+

 	isc->stop = true;
 
 	/* Wait until the end of the current frame */
@@ -1941,7 +1951,7 @@  static void isc_awb_work(struct work_struct *w)

 	baysel = isc->config.sd_format->cfa_baycfg << ISC_HIS_CFG_BAYSEL_SHIFT;
 
 	/* if no more auto white balance, reset controls. */
-	if (!ctrls->awb)

+	if (ctrls->awb == ISC_WB_NONE)

 		isc_reset_awb_ctrls(isc);
 
 	pm_runtime_get_sync(isc->dev);
@@ -1950,7 +1960,7 @@  static void isc_awb_work(struct work_struct *w)

 	 * only update if we have all the required histograms and controls
 	 * if awb has been disabled, we need to reset registers as well.
 	 */
-	if (hist_id == ISC_HIS_CFG_MODE_GR || !ctrls->awb) {

+	if (hist_id == ISC_HIS_CFG_MODE_GR || ctrls->awb == ISC_WB_NONE) {

 		/*
 		 * It may happen that DMA Done IRQ will trigger while we are
 		 * updating white balance registers here.
@@ -1960,6 +1970,16 @@  static void isc_awb_work(struct work_struct *w)

 		spin_lock_irqsave(&isc->awb_lock, flags);
 		isc_update_awb_ctrls(isc);
 		spin_unlock_irqrestore(&isc->awb_lock, flags);
+

+		/*

+		 * if we are doing just the one time white balance adjustment,

+		 * we are basically done.

+		 */

+		if (ctrls->awb == ISC_WB_ONETIME) {

+			v4l2_info(&isc->v4l2_dev,

+				  "Completed one time white-balance adjustment.\n");

+			ctrls->awb = ISC_WB_NONE;

+		}

 	}
 	regmap_write(regmap, ISC_HIS_CFG, hist_id | baysel | ISC_HIS_CFG_RAR);
 	isc_update_profile(isc);
@@ -1976,6 +1996,9 @@  static int isc_s_ctrl(struct v4l2_ctrl *ctrl)

 					     struct isc_device, ctrls.handler);
 	struct isc_ctrls *ctrls = &isc->ctrls;
 
+	if (ctrl->flags & V4L2_CTRL_FLAG_INACTIVE)

+		return 0;

+

 	switch (ctrl->id) {
 	case V4L2_CID_BRIGHTNESS:
 		ctrls->brightness = ctrl->val & ISC_CBC_BRIGHT_MASK;
@@ -1987,10 +2010,33 @@  static int isc_s_ctrl(struct v4l2_ctrl *ctrl)

 		ctrls->gamma_index = ctrl->val;
 		break;
 	case V4L2_CID_AUTO_WHITE_BALANCE:
-		ctrls->awb = ctrl->val;

-		if (ctrls->hist_stat != HIST_ENABLED) {

+		if (ctrl->val == 1)

+			ctrls->awb = ISC_WB_AUTO;

+		else

+			ctrls->awb = ISC_WB_NONE;

+

+		/* we did not configure ISC yet */

+		if (!isc->config.sd_format)

+			break;

+

+		if (ctrls->hist_stat != HIST_ENABLED)

 			isc_reset_awb_ctrls(isc);
-		}

+

+		if (isc->ctrls.awb == ISC_WB_AUTO &&

+		    vb2_is_streaming(&isc->vb2_vidq) &&

+		    ISC_IS_FORMAT_RAW(isc->config.sd_format->mbus_code))

+			isc_set_histogram(isc, true);

+

+		break;

+	case V4L2_CID_DO_WHITE_BALANCE:

+		/* if AWB is enabled, do nothing */

+		if (ctrls->awb == ISC_WB_AUTO)

+			return 0;

+

+		ctrls->awb = ISC_WB_ONETIME;

+		isc_set_histogram(isc, true);

+		v4l2_dbg(1, debug, &isc->v4l2_dev,

+			 "One time white-balance started.\n");

 		break;
 	default:
 		return -EINVAL;
@@ -2013,7 +2059,7 @@  static int isc_ctrl_init(struct isc_device *isc)

 	ctrls->hist_stat = HIST_INIT;
 	isc_reset_awb_ctrls(isc);
 
-	ret = v4l2_ctrl_handler_init(hdl, 4);

+	ret = v4l2_ctrl_handler_init(hdl, 5);

 	if (ret < 0)
 		return ret;
 
@@ -2025,6 +2071,12 @@  static int isc_ctrl_init(struct isc_device *isc)

 	v4l2_ctrl_new_std(hdl, ops, V4L2_CID_GAMMA, 0, GAMMA_MAX, 1, 2);
 	v4l2_ctrl_new_std(hdl, ops, V4L2_CID_AUTO_WHITE_BALANCE, 0, 1, 1, 1);
 
+	/* do_white_balance is a button, so min,max,step,default are ignored */

+	isc->do_wb_ctrl = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_DO_WHITE_BALANCE,

+					    0, 0, 0, 0);

+

+	v4l2_ctrl_activate(isc->do_wb_ctrl, false);

+

 	v4l2_ctrl_handler_setup(hdl);
 
 	return 0;

Privacy Policy