Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b8ebfeb authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Greg Kroah-Hartman
Browse files

greybus: camera: Fix data connection setup 



When the module is in the configured state, an attempt to change the
configuration must first tear down the data connection to update its
parameters, as the APB1 bridge doesn't support modifying the CSI
transmitter configuration when it is already started.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarGjorgji Rosikopulos <grosikopulos@mm-sol.com>
Tested-by: default avatarGjorgji Rosikopulos <grosikopulos@mm-sol.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent f3d5f661

drivers/staging/greybus/camera.c

+19 −5
Original line number Original line Diff line number Diff line
@@ -33,11 +33,17 @@ struct gb_camera_debugfs_buffer { 
	size_t length;

	size_t length;

};

};





enum gb_camera_state {

	GB_CAMERA_STATE_UNCONFIGURED,

	GB_CAMERA_STATE_CONFIGURED,

};



/**

/**

 * struct gb_camera - A Greybus Camera Device

 * struct gb_camera - A Greybus Camera Device

 * @connection: the greybus connection for camera management

 * @connection: the greybus connection for camera management

 * @data_connection: the greybus connection for camera data

 * @data_connection: the greybus connection for camera data

 * @mutex: protects the connection field

 * @mutex: protects the connection and state fields

 * @state: the current module state

 * @debugfs: debugfs entries for camera protocol operations testing

 * @debugfs: debugfs entries for camera protocol operations testing

 * @module: Greybus camera module registered to HOST processor.

 * @module: Greybus camera module registered to HOST processor.

 */

 */
@@ -45,7 +51,9 @@ struct gb_camera { 
	struct gb_bundle *bundle;

	struct gb_bundle *bundle;

	struct gb_connection *connection;

	struct gb_connection *connection;

	struct gb_connection *data_connection;

	struct gb_connection *data_connection;



	struct mutex mutex;

	struct mutex mutex;

	enum gb_camera_state state;





	struct {

	struct {

		struct dentry *root;

		struct dentry *root;
@@ -300,7 +308,6 @@ static int gb_camera_configure_streams(struct gb_camera *gcam, 
{

{

	struct gb_camera_configure_streams_request *req;

	struct gb_camera_configure_streams_request *req;

	struct gb_camera_configure_streams_response *resp;

	struct gb_camera_configure_streams_response *resp;



	unsigned int nstreams = *num_streams;

	unsigned int nstreams = *num_streams;

	unsigned int i;

	unsigned int i;

	size_t req_size;

	size_t req_size;
@@ -385,6 +392,11 @@ static int gb_camera_configure_streams(struct gb_camera *gcam, 
		goto done;

		goto done;

	}

	}





	if (gcam->state == GB_CAMERA_STATE_CONFIGURED) {

		gb_camera_teardown_data_connection(gcam);

		gcam->state = GB_CAMERA_STATE_UNCONFIGURED;

	}



	if (resp->num_streams) {

	if (resp->num_streams) {

		ret = gb_camera_setup_data_connection(gcam, resp, csi_params);

		ret = gb_camera_setup_data_connection(gcam, resp, csi_params);

		if (ret < 0) {

		if (ret < 0) {
@@ -394,8 +406,8 @@ static int gb_camera_configure_streams(struct gb_camera *gcam, 
					  req, req_size, resp, resp_size);

					  req, req_size, resp, resp_size);

			goto done;

			goto done;

		}

		}

	} else {



		gb_camera_teardown_data_connection(gcam);

		gcam->state = GB_CAMERA_STATE_CONFIGURED;

	}

	}





	*flags = resp->flags;

	*flags = resp->flags;
@@ -1039,9 +1051,11 @@ static int gb_camera_probe(struct gb_bundle *bundle, 
	if (!gcam)

	if (!gcam)

		return -ENOMEM;

		return -ENOMEM;





	gcam->bundle = bundle;

	mutex_init(&gcam->mutex);

	mutex_init(&gcam->mutex);





	gcam->bundle = bundle;

	gcam->state = GB_CAMERA_STATE_UNCONFIGURED;



	conn = gb_connection_create(bundle, mgmt_cport_id,

	conn = gb_connection_create(bundle, mgmt_cport_id,

				    gb_camera_request_handler);

				    gb_camera_request_handler);

	if (IS_ERR(conn)) {

	if (IS_ERR(conn)) {