CCS active state fixes
Subsystems (2)
Sakari Ailus
maintainerv3 cover CCS active state fixes
Hi folks,
This set new includes fixes for the the CCS driver sub-device state patch.
since v2:
- Avoid framework changes. As this is a fix, merging this soon is important. Let's discuss framework improvements later on.
since v1:
- There were other drivers using __v4l2_subdev_state_alloc(). Ouch. Change those users as well. Note that this function should not be used in drivers, hence API niceness is not a high priority.
Sakari Ailus (2):
media: ccs: Rework initialising sub-device state
media: ccs: Fix a (harmless) lockdep warning
drivers/media/i2c/ccs/ccs-core.c | 62 ++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 22 deletions(-)
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v3 1/2 media: ccs: Rework initialising sub-device state
Initialise sub-device state in init_cfg callback using ccs_propagate() to the extent it covers of the initialisation. This fixes a bug where the driver configuration was incorrectly initialised.
--- drivers/media/i2c/ccs/ccs-core.c | 45 ++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 17 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +28 -17
@@ -2075,6 +2075,7 @@ static void ccs_propagate(struct v4l2_subdev *subdev,struct ccs_sensor *sensor =to_ccs_sensor (subdev);struct ccs_subdev *ssd =to_ccs_subdev (subdev);struct v4l2_rect *comp, *crops[CCS_PADS ]; +struct v4l2_mbus_framefmt *fmt;ccs_get_crop_compose (subdev, sd_state, crops, &comp);
@@ -2096,6 +2097,9 @@ static void ccs_propagate(struct v4l2_subdev *subdev, fallthrough;case V4L2_SEL_TGT_COMPOSE : *crops[CCS_PAD_SRC ] = *comp; + fmt =v4l2_subdev_get_pad_format (subdev, sd_state,CCS_PAD_SRC ); + fmt->width = comp->width; + fmt->height = comp->height;if (which ==V4L2_SUBDEV_FORMAT_ACTIVE && ssd == sensor->src) sensor->src_src = *crops[CCS_PAD_SRC ];break ;
@@ -3003,31 +3007,38 @@ static int ccs_init_cfg(struct v4l2_subdev *sd, {struct ccs_subdev *ssd =to_ccs_subdev (sd);struct ccs_sensor *sensor = ssd->sensor; -unsigned int i; +unsigned int pad = ssd == sensor->pixel_array ? +CCS_PA_PAD_SRC :CCS_PAD_SINK ; +struct v4l2_mbus_framefmt *fmt = +v4l2_subdev_get_pad_format (sd, sd_state, pad); +struct v4l2_rect *crop = +v4l2_subdev_get_pad_crop (sd, sd_state, pad); +bool is_active = !sd->active_state || sd->active_state == sd_state;mutex_lock (&sensor->mutex); -for (i =0 ; i < ssd->npads; i++) { -struct v4l2_mbus_framefmt *fmt = -v4l2_subdev_get_pad_format (sd, sd_state, i); -struct v4l2_rect *crop = -v4l2_subdev_get_pad_crop (sd, sd_state, i); -struct v4l2_rect *comp; - -ccs_get_native_size (ssd, crop); +ccs_get_native_size (ssd, crop); - fmt->width = crop->width; - fmt->height = crop->height; - fmt->code = sensor->internal_csi_format->code; - fmt->field =V4L2_FIELD_NONE ; + fmt->width = crop->width; + fmt->height = crop->height; + fmt->code = sensor->internal_csi_format->code; + fmt->field =V4L2_FIELD_NONE ; -if (ssd == sensor->pixel_array) -continue ; +if (ssd == sensor->pixel_array) { +if (is_active) + sensor->pa_src = *crop; - comp =v4l2_subdev_get_pad_compose (sd, sd_state, i); - *comp = *crop; +mutex_unlock (&sensor->mutex); +return 0 ; } + fmt =v4l2_subdev_get_pad_format (sd, sd_state,CCS_PAD_SRC ); + fmt->code = ssd == sensor->src ? + sensor->csi_format->code : sensor->internal_csi_format->code; + fmt->field =V4L2_FIELD_NONE ; + +ccs_propagate (sd, sd_state, is_active,V4L2_SEL_TGT_CROP ); +mutex_unlock (&sensor->mutex);return 0 ;
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v3 2/2 media: ccs: Fix a (harmless) lockdep warning
In reply to Sakari AilusThe v4l2_subdev_init_finalize() is a macro that creates an unique lockdep key and name. As the CCS driver initialises all three of its sub-devices using the same call site, this creates a lockdep warning. Address it.
--- drivers/media/i2c/ccs/ccs-core.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +12 -5
@@ -2955,7 +2955,9 @@ static void ccs_cleanup(struct ccs_sensor *sensor)static int ccs_init_subdev (struct ccs_sensor *sensor,struct ccs_subdev *ssd,const char *name, -unsigned short num_pads,u32 function) +unsigned short num_pads,u32 function, +const char *lock_name, +struct lock_class_key *lock_key) {struct i2c_client *client =v4l2_get_subdevdata (&sensor->src->sd);int rval;
@@ -2993,7 +2995,7 @@ static int ccs_init_subdev(struct ccs_sensor *sensor,return rval; } - rval =v4l2_subdev_init_finalize (&ssd->sd); + rval =__v4l2_subdev_init_finalize (&ssd->sd, lock_name, lock_key);if (rval) {media_entity_cleanup (&ssd->sd.entity);return rval;
@@ -3206,6 +3208,8 @@ static int ccs_firmware_name(struct i2c_client *client,static int ccs_probe (struct i2c_client *client) { +static struct lock_class_key pixel_array_lock_key, binner_lock_key, + scaler_lock_key;const struct ccs_device *ccsdev =device_get_match_data (&client->dev);struct ccs_sensor *sensor;const struct firmware *fw;
@@ -3489,15 +3493,18 @@ static int ccs_probe(struct i2c_client *client) } rval =ccs_init_subdev (sensor, sensor->scaler," scaler" ,2 , -MEDIA_ENT_F_PROC_VIDEO_SCALER ); +MEDIA_ENT_F_PROC_VIDEO_SCALER , +"ccs scaler mutex" , &scaler_lock_key);if (rval) goto out_cleanup; rval =ccs_init_subdev (sensor, sensor->binner," binner" ,2 , -MEDIA_ENT_F_PROC_VIDEO_SCALER ); +MEDIA_ENT_F_PROC_VIDEO_SCALER , +"ccs binner mutex" , &binner_lock_key);if (rval) goto out_cleanup; rval =ccs_init_subdev (sensor, sensor->pixel_array," pixel_array" ,1 , -MEDIA_ENT_F_CAM_SENSOR ); +MEDIA_ENT_F_CAM_SENSOR ,"ccs pixel array mutex" , + &pixel_array_lock_key);if (rval) goto out_cleanup;
Signature · 1 line
2.39.2