From: Jacopo Mondi <jacopo.mondi@linaro.org>
Date: Fri, 5 Feb 2016 08:35:32 +0000 (+0100)
Subject: greybus: camera: Reset link speed on failed config
X-Git-Tag: v4.9.8~1233^2~378^2~21^2~725
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f121d79d8acb0852f42b42b111967a3ef265362b;p=platform%2Fkernel%2Flinux-rpi3.git

greybus: camera: Reset link speed on failed config

Improve the management of unipro power mode changes in response
to a configure_stream operation.
When sending a "test only" request to camera module, do not change power
mode to HS-G2 as no frame will be actually transmitted.
When receiveing an "adjusted" configuration response, reset power
mode to PWM-G1.

Signed-off-by: Jacopo Mondi <jacopo.mondi@linaro.org>
Reviewed-by: Gjorgji Rosikopulos <grosikopulos@mm-sol.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---

diff --git a/drivers/staging/greybus/camera.c b/drivers/staging/greybus/camera.c
index c735908..90eef23 100644
--- a/drivers/staging/greybus/camera.c
+++ b/drivers/staging/greybus/camera.c
@@ -150,7 +150,7 @@ static int gb_camera_configure_streams(struct gb_camera *gcam,
 	 * to the camera module, to assure unipro network speed is set
 	 * before CSI interfaces gets configured
 	 */
-	if (nstreams) {
+	if (nstreams && !(*flags & GB_CAMERA_CONFIGURE_STREAMS_TEST_ONLY)) {
 		ret = gb_svc_intf_set_power_mode(svc, intf->interface_id,
 						 GB_SVC_UNIPRO_HS_SERIES_A,
 						 GB_SVC_UNIPRO_FAST_MODE, 2, 2,
@@ -168,7 +168,7 @@ static int gb_camera_configure_streams(struct gb_camera *gcam,
 						 GB_SVC_PWRM_TXTERMINATION, 0);
 		if (ret < 0)
 			goto done;
-	} else {
+	} else if (nstreams == 0) {
 		ret = gb_svc_intf_set_power_mode(svc, intf->interface_id,
 						 GB_SVC_UNIPRO_HS_SERIES_A,
 						 GB_SVC_UNIPRO_SLOW_AUTO_MODE,
@@ -228,8 +228,6 @@ static int gb_camera_configure_streams(struct gb_camera *gcam,
 		goto set_unipro_slow_mode;
 	}
 
-	*flags = resp->flags;
-
 	for (i = 0; i < nstreams; ++i) {
 		struct gb_camera_stream_config_response *cfg = &resp->config[i];
 
@@ -248,10 +246,16 @@ static int gb_camera_configure_streams(struct gb_camera *gcam,
 		}
 	}
 
+	if (nstreams && resp->flags & GB_CAMERA_CONFIGURE_STREAMS_ADJUSTED) {
+		*flags = resp->flags;
+		*num_streams = resp->num_streams;
+		goto set_unipro_slow_mode;
+	}
+
 	memset(&csi_cfg, 0, sizeof(csi_cfg));
 
 	/* Configure the CSI transmitter. Hardcode the parameters for now. */
-	if (nstreams && !(resp->flags & GB_CAMERA_CONFIGURE_STREAMS_ADJUSTED)) {
+	if (nstreams) {
 		csi_cfg.csi_id = 1;
 		csi_cfg.clock_mode = 0;
 		csi_cfg.num_lanes = 4;
@@ -259,7 +263,7 @@ static int gb_camera_configure_streams(struct gb_camera *gcam,
 		ret = gb_hd_output(gcam->connection->hd, &csi_cfg,
 				   sizeof(csi_cfg),
 				   GB_APB_REQUEST_CSI_TX_CONTROL, false);
-	} else if (nstreams == 0) {
+	} else {
 		csi_cfg.csi_id = 1;
 		ret = gb_hd_output(gcam->connection->hd, &csi_cfg,
 				   sizeof(csi_cfg),
@@ -270,6 +274,7 @@ static int gb_camera_configure_streams(struct gb_camera *gcam,
 		gcam_err(gcam, "failed to %s the CSI transmitter\n",
 			 nstreams ? "start" : "stop");
 
+	*flags = resp->flags;
 	*num_streams = resp->num_streams;
 	ret = 0;