[2/5] media: i2c: imx290: Add support for test pattern generation

Message ID 20191129190541.30315-3-manivannan.sadhasivam@linaro.org
State New
Headers show
Series
  • Improvements to IMX290 CMOS driver
Related show

Commit Message

Manivannan Sadhasivam Nov. 29, 2019, 7:05 p.m.
Add support for generating following test patterns by IMX290:

* Sequence Pattern 1
* Horizontal Color-bar Chart
* Vertical Color-bar Chart
* Sequence Pattern 2
* Gradation Pattern 1
* Gradation Pattern 2
* 000/555h Toggle Pattern

Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

---
 drivers/media/i2c/imx290.c | 41 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

-- 
2.17.1

Comments

Manivannan Sadhasivam Dec. 15, 2019, 5:35 p.m. | #1
Hi Sakari,

On Tue, Dec 03, 2019 at 10:48:50AM +0200, Sakari Ailus wrote:
> Hi Manivannan,

> 

> On Sat, Nov 30, 2019 at 12:35:38AM +0530, Manivannan Sadhasivam wrote:

> > Add support for generating following test patterns by IMX290:

> > 

> > * Sequence Pattern 1

> > * Horizontal Color-bar Chart

> > * Vertical Color-bar Chart

> > * Sequence Pattern 2

> > * Gradation Pattern 1

> > * Gradation Pattern 2

> > * 000/555h Toggle Pattern

> > 

> > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

> > ---

> >  drivers/media/i2c/imx290.c | 41 +++++++++++++++++++++++++++++++++++++-

> >  1 file changed, 40 insertions(+), 1 deletion(-)

> > 

> > diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c

> > index 1d49910937fb..e218c959a729 100644

> > --- a/drivers/media/i2c/imx290.c

> > +++ b/drivers/media/i2c/imx290.c

> > @@ -26,12 +26,19 @@

> >  #define IMX290_REGHOLD 0x3001

> >  #define IMX290_XMSTA 0x3002

> >  #define IMX290_FR_FDG_SEL 0x3009

> > +#define IMX290_BLKLEVEL_LOW 0x300a

> > +#define IMX290_BLKLEVEL_HIGH 0x300b

> >  #define IMX290_GAIN 0x3014

> >  #define IMX290_HMAX_LOW 0x301c

> >  #define IMX290_HMAX_HIGH 0x301d

> > +#define IMX290_PGCTRL 0x308c

> >  #define IMX290_PHY_LANE_NUM 0x3407

> >  #define IMX290_CSI_LANE_MODE 0x3443

> >  

> > +#define IMX290_PGCTRL_REGEN BIT(0)

> > +#define IMX290_PGCTRL_THRU BIT(1)

> > +#define IMX290_PGCTRL_MODE(n) ((n) << 4)

> > +

> >  /* HMAX fields */

> >  #define IMX290_HMAX_2_1920 0x1130

> >  #define IMX290_HMAX_4_1920 0x0898

> > @@ -99,6 +106,17 @@ static const struct regmap_config imx290_regmap_config = {

> >  	.cache_type = REGCACHE_RBTREE,

> >  };

> >  

> > +static const char * const imx290_test_pattern_menu[] = {

> > +	"Disabled",

> > +	"Sequence Pattern 1",

> > +	"Horizontal Color-bar Chart",

> > +	"Vertical Color-bar Chart",

> > +	"Sequence Pattern 2",

> > +	"Gradation Pattern 1",

> > +	"Gradation Pattern 2",

> > +	"000/555h Toggle Pattern",

> > +};

> > +

> >  static const struct imx290_regval imx290_global_init_settings[] = {

> >  	{ 0x3007, 0x00 },

> >  	{ 0x3018, 0x65 },

> > @@ -394,6 +412,22 @@ static int imx290_set_ctrl(struct v4l2_ctrl *ctrl)

> >  	case V4L2_CID_GAIN:

> >  		ret = imx290_set_gain(imx290, ctrl->val);

> >  		break;

> > +	case V4L2_CID_TEST_PATTERN:

> > +		if (ctrl->val) {

> > +			imx290_write_reg(imx290, IMX290_BLKLEVEL_LOW, 0x00);

> > +			imx290_write_reg(imx290, IMX290_BLKLEVEL_HIGH, 0x00);

> > +			mdelay(10);

> 

> Any particular reason for a busy loop instead of sleeping? Same below.

> 


Nothing. I should've used msleep() here... Will change it.

Thanks,
Mani

> > +			imx290_write_reg(imx290, IMX290_PGCTRL,

> > +					 (u8)(IMX290_PGCTRL_REGEN |

> > +					 IMX290_PGCTRL_THRU |

> > +					 IMX290_PGCTRL_MODE(ctrl->val)));

> > +		} else {

> > +			imx290_write_reg(imx290, IMX290_PGCTRL, 0x00);

> > +			mdelay(10);

> > +			imx290_write_reg(imx290, IMX290_BLKLEVEL_LOW, 0x3c);

> > +			imx290_write_reg(imx290, IMX290_BLKLEVEL_HIGH, 0x00);

> > +		}

> > +		break;

> >  	default:

> >  		ret = -EINVAL;

> >  		break;

> > @@ -878,7 +912,7 @@ static int imx290_probe(struct i2c_client *client)

> >  

> >  	mutex_init(&imx290->lock);

> >  

> > -	v4l2_ctrl_handler_init(&imx290->ctrls, 3);

> > +	v4l2_ctrl_handler_init(&imx290->ctrls, 4);

> >  

> >  	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,

> >  			  V4L2_CID_GAIN, 0, 72, 1, 0);

> > @@ -896,6 +930,11 @@ static int imx290_probe(struct i2c_client *client)

> >  					       INT_MAX, 1,

> >  					       imx290_modes[0].pixel_rate);

> >  

> > +	v4l2_ctrl_new_std_menu_items(&imx290->ctrls, &imx290_ctrl_ops,

> > +				     V4L2_CID_TEST_PATTERN,

> > +				     ARRAY_SIZE(imx290_test_pattern_menu) - 1,

> > +				     0, 0, imx290_test_pattern_menu);

> > +

> >  	imx290->sd.ctrl_handler = &imx290->ctrls;

> >  

> >  	if (imx290->ctrls.error) {

> 

> -- 

> Sakari Ailus

Patch

diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
index 1d49910937fb..e218c959a729 100644
--- a/drivers/media/i2c/imx290.c
+++ b/drivers/media/i2c/imx290.c
@@ -26,12 +26,19 @@ 
 #define IMX290_REGHOLD 0x3001
 #define IMX290_XMSTA 0x3002
 #define IMX290_FR_FDG_SEL 0x3009
+#define IMX290_BLKLEVEL_LOW 0x300a
+#define IMX290_BLKLEVEL_HIGH 0x300b
 #define IMX290_GAIN 0x3014
 #define IMX290_HMAX_LOW 0x301c
 #define IMX290_HMAX_HIGH 0x301d
+#define IMX290_PGCTRL 0x308c
 #define IMX290_PHY_LANE_NUM 0x3407
 #define IMX290_CSI_LANE_MODE 0x3443
 
+#define IMX290_PGCTRL_REGEN BIT(0)
+#define IMX290_PGCTRL_THRU BIT(1)
+#define IMX290_PGCTRL_MODE(n) ((n) << 4)
+
 /* HMAX fields */
 #define IMX290_HMAX_2_1920 0x1130
 #define IMX290_HMAX_4_1920 0x0898
@@ -99,6 +106,17 @@  static const struct regmap_config imx290_regmap_config = {
 	.cache_type = REGCACHE_RBTREE,
 };
 
+static const char * const imx290_test_pattern_menu[] = {
+	"Disabled",
+	"Sequence Pattern 1",
+	"Horizontal Color-bar Chart",
+	"Vertical Color-bar Chart",
+	"Sequence Pattern 2",
+	"Gradation Pattern 1",
+	"Gradation Pattern 2",
+	"000/555h Toggle Pattern",
+};
+
 static const struct imx290_regval imx290_global_init_settings[] = {
 	{ 0x3007, 0x00 },
 	{ 0x3018, 0x65 },
@@ -394,6 +412,22 @@  static int imx290_set_ctrl(struct v4l2_ctrl *ctrl)
 	case V4L2_CID_GAIN:
 		ret = imx290_set_gain(imx290, ctrl->val);
 		break;
+	case V4L2_CID_TEST_PATTERN:
+		if (ctrl->val) {
+			imx290_write_reg(imx290, IMX290_BLKLEVEL_LOW, 0x00);
+			imx290_write_reg(imx290, IMX290_BLKLEVEL_HIGH, 0x00);
+			mdelay(10);
+			imx290_write_reg(imx290, IMX290_PGCTRL,
+					 (u8)(IMX290_PGCTRL_REGEN |
+					 IMX290_PGCTRL_THRU |
+					 IMX290_PGCTRL_MODE(ctrl->val)));
+		} else {
+			imx290_write_reg(imx290, IMX290_PGCTRL, 0x00);
+			mdelay(10);
+			imx290_write_reg(imx290, IMX290_BLKLEVEL_LOW, 0x3c);
+			imx290_write_reg(imx290, IMX290_BLKLEVEL_HIGH, 0x00);
+		}
+		break;
 	default:
 		ret = -EINVAL;
 		break;
@@ -878,7 +912,7 @@  static int imx290_probe(struct i2c_client *client)
 
 	mutex_init(&imx290->lock);
 
-	v4l2_ctrl_handler_init(&imx290->ctrls, 3);
+	v4l2_ctrl_handler_init(&imx290->ctrls, 4);
 
 	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
 			  V4L2_CID_GAIN, 0, 72, 1, 0);
@@ -896,6 +930,11 @@  static int imx290_probe(struct i2c_client *client)
 					       INT_MAX, 1,
 					       imx290_modes[0].pixel_rate);
 
+	v4l2_ctrl_new_std_menu_items(&imx290->ctrls, &imx290_ctrl_ops,
+				     V4L2_CID_TEST_PATTERN,
+				     ARRAY_SIZE(imx290_test_pattern_menu) - 1,
+				     0, 0, imx290_test_pattern_menu);
+
 	imx290->sd.ctrl_handler = &imx290->ctrls;
 
 	if (imx290->ctrls.error) {