Commit 34af7d92 authored by Akinobu Mita's avatar Akinobu Mita Committed by Mauro Carvalho Chehab

media: ov772x: handle nested s_power() calls

Depending on the v4l2 driver, calling s_power() could be nested.  So the
actual transitions between power saving mode and normal operation mode
should only happen at the first power on and the last power off.

This adds an s_power() nesting counter and updates the power state if the
counter is modified from 0 to != 0 or from != 0 to 0.

Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: default avatarJacopo Mondi <jacopo@jmondi.org>
Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent c2cae895
...@@ -424,6 +424,9 @@ struct ov772x_priv { ...@@ -424,6 +424,9 @@ struct ov772x_priv {
/* band_filter = COM8[5] ? 256 - BDBASE : 0 */ /* band_filter = COM8[5] ? 256 - BDBASE : 0 */
unsigned short band_filter; unsigned short band_filter;
unsigned int fps; unsigned int fps;
/* lock to protect power_count */
struct mutex lock;
int power_count;
#ifdef CONFIG_MEDIA_CONTROLLER #ifdef CONFIG_MEDIA_CONTROLLER
struct media_pad pad; struct media_pad pad;
#endif #endif
...@@ -871,9 +874,26 @@ static int ov772x_power_off(struct ov772x_priv *priv) ...@@ -871,9 +874,26 @@ static int ov772x_power_off(struct ov772x_priv *priv)
static int ov772x_s_power(struct v4l2_subdev *sd, int on) static int ov772x_s_power(struct v4l2_subdev *sd, int on)
{ {
struct ov772x_priv *priv = to_ov772x(sd); struct ov772x_priv *priv = to_ov772x(sd);
int ret = 0;
mutex_lock(&priv->lock);
/* If the power count is modified from 0 to != 0 or from != 0 to 0,
* update the power state.
*/
if (priv->power_count == !on)
ret = on ? ov772x_power_on(priv) : ov772x_power_off(priv);
if (!ret) {
/* Update the power count. */
priv->power_count += on ? 1 : -1;
WARN(priv->power_count < 0, "Unbalanced power count\n");
WARN(priv->power_count > 1, "Duplicated s_power call\n");
}
mutex_unlock(&priv->lock);
return on ? ov772x_power_on(priv) : return ret;
ov772x_power_off(priv);
} }
static const struct ov772x_win_size *ov772x_select_win(u32 width, u32 height) static const struct ov772x_win_size *ov772x_select_win(u32 width, u32 height)
...@@ -1303,6 +1323,7 @@ static int ov772x_probe(struct i2c_client *client, ...@@ -1303,6 +1323,7 @@ static int ov772x_probe(struct i2c_client *client,
return -ENOMEM; return -ENOMEM;
priv->info = client->dev.platform_data; priv->info = client->dev.platform_data;
mutex_init(&priv->lock);
v4l2_i2c_subdev_init(&priv->subdev, client, &ov772x_subdev_ops); v4l2_i2c_subdev_init(&priv->subdev, client, &ov772x_subdev_ops);
v4l2_ctrl_handler_init(&priv->hdl, 3); v4l2_ctrl_handler_init(&priv->hdl, 3);
...@@ -1313,8 +1334,10 @@ static int ov772x_probe(struct i2c_client *client, ...@@ -1313,8 +1334,10 @@ static int ov772x_probe(struct i2c_client *client,
v4l2_ctrl_new_std(&priv->hdl, &ov772x_ctrl_ops, v4l2_ctrl_new_std(&priv->hdl, &ov772x_ctrl_ops,
V4L2_CID_BAND_STOP_FILTER, 0, 256, 1, 0); V4L2_CID_BAND_STOP_FILTER, 0, 256, 1, 0);
priv->subdev.ctrl_handler = &priv->hdl; priv->subdev.ctrl_handler = &priv->hdl;
if (priv->hdl.error) if (priv->hdl.error) {
return priv->hdl.error; ret = priv->hdl.error;
goto error_mutex_destroy;
}
priv->clk = clk_get(&client->dev, NULL); priv->clk = clk_get(&client->dev, NULL);
if (IS_ERR(priv->clk)) { if (IS_ERR(priv->clk)) {
...@@ -1362,6 +1385,8 @@ static int ov772x_probe(struct i2c_client *client, ...@@ -1362,6 +1385,8 @@ static int ov772x_probe(struct i2c_client *client,
clk_put(priv->clk); clk_put(priv->clk);
error_ctrl_free: error_ctrl_free:
v4l2_ctrl_handler_free(&priv->hdl); v4l2_ctrl_handler_free(&priv->hdl);
error_mutex_destroy:
mutex_destroy(&priv->lock);
return ret; return ret;
} }
...@@ -1376,6 +1401,7 @@ static int ov772x_remove(struct i2c_client *client) ...@@ -1376,6 +1401,7 @@ static int ov772x_remove(struct i2c_client *client)
gpiod_put(priv->pwdn_gpio); gpiod_put(priv->pwdn_gpio);
v4l2_async_unregister_subdev(&priv->subdev); v4l2_async_unregister_subdev(&priv->subdev);
v4l2_ctrl_handler_free(&priv->hdl); v4l2_ctrl_handler_free(&priv->hdl);
mutex_destroy(&priv->lock);
return 0; return 0;
} }
......
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