From: Hans de Goede Date: Tue, 30 Dec 2025 17:03:09 +0000 (+0100) Subject: media: mt9m114: Drop start-, stop-streaming sequence from initialize X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46c96eec9a763813e4592d72ecb38a6a33113258;p=thirdparty%2Fkernel%2Flinux.git media: mt9m114: Drop start-, stop-streaming sequence from initialize Drop the start-, stop-streaming sequence from initialize. When streaming is started with a runtime-suspended sensor, mt9m114_start_streaming() will runtime-resume the sensor which calls mt9m114_initialize() immediately followed by calling mt9m114_set_state(ENTER_CONFIG_CHANGE). This results in the following state changes in quick succession: mt9m114_set_state(ENTER_CONFIG_CHANGE) -> transitions to STREAMING mt9m114_set_state(ENTER_SUSPEND) -> transitions to SUSPENDED mt9m114_set_state(ENTER_CONFIG_CHANGE) -> transitions to STREAMING these quick state changes confuses the CSI receiver on atomisp devices causing streaming to not work. Drop the state changes from mt9m114_initialize() and move the mt9m114_initialize() call to mt9m114_start_streaming() so that only a single mt9m114_set_state(ENTER_CONFIG_CHANGE) call is made when streaming is started with a runtime-suspend sensor. Reviewed-by: Laurent Pinchart Signed-off-by: Hans de Goede Signed-off-by: Sakari Ailus Signed-off-by: Hans Verkuil --- diff --git a/drivers/media/i2c/mt9m114.c b/drivers/media/i2c/mt9m114.c index 9743d83e9d0d6..4be81fe3c8279 100644 --- a/drivers/media/i2c/mt9m114.c +++ b/drivers/media/i2c/mt9m114.c @@ -789,14 +789,6 @@ static int mt9m114_initialize(struct mt9m114 *sensor) if (ret < 0) return ret; - ret = mt9m114_set_state(sensor, MT9M114_SYS_STATE_ENTER_CONFIG_CHANGE); - if (ret < 0) - return ret; - - ret = mt9m114_set_state(sensor, MT9M114_SYS_STATE_ENTER_SUSPEND); - if (ret < 0) - return ret; - return 0; } @@ -967,6 +959,10 @@ static int mt9m114_start_streaming(struct mt9m114 *sensor, if (ret) return ret; + ret = mt9m114_initialize(sensor); + if (ret) + goto error; + ret = mt9m114_configure_ifp(sensor, ifp_state); if (ret) goto error; @@ -2318,19 +2314,8 @@ static int __maybe_unused mt9m114_runtime_resume(struct device *dev) { struct v4l2_subdev *sd = dev_get_drvdata(dev); struct mt9m114 *sensor = ifp_to_mt9m114(sd); - int ret; - - ret = mt9m114_power_on(sensor); - if (ret) - return ret; - - ret = mt9m114_initialize(sensor); - if (ret) { - mt9m114_power_off(sensor); - return ret; - } - return 0; + return mt9m114_power_on(sensor); } static int __maybe_unused mt9m114_runtime_suspend(struct device *dev) @@ -2574,8 +2559,8 @@ static int mt9m114_probe(struct i2c_client *client) /* * Identify the sensor. The driver supports runtime PM, but needs to * work when runtime PM is disabled in the kernel. To that end, power - * the sensor on manually here, and initialize it after identification - * to reach the same state as if resumed through runtime PM. + * the sensor on manually here to reach the same state as if resumed + * through runtime PM. */ ret = mt9m114_power_on(sensor); if (ret < 0) { @@ -2587,10 +2572,6 @@ static int mt9m114_probe(struct i2c_client *client) if (ret < 0) goto error_power_off; - ret = mt9m114_initialize(sensor); - if (ret < 0) - goto error_power_off; - /* * Enable runtime PM with autosuspend. As the device has been powered * manually, mark it as active, and increase the usage count without