Hi Sakari,
Thank you for the patch.
On Tue, Apr 16, 2024 at 10:32:57PM +0300, Sakari Ailus wrote:
> Provide information on the frame layout using frame descriptors.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
> Reviewed-by: Julien Massot <julien.massot@xxxxxxxxxxxxx>
Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
> drivers/media/i2c/ccs/ccs-core.c | 57 ++++++++++++++++++++++++++++++++
> drivers/media/i2c/ccs/ccs.h | 4 +++
> 2 files changed, 61 insertions(+)
>
> diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-core.c
> index a711233f6fbf..3ca2415fca3b 100644
> --- a/drivers/media/i2c/ccs/ccs-core.c
> +++ b/drivers/media/i2c/ccs/ccs-core.c
> @@ -25,6 +25,7 @@
> #include <linux/slab.h>
> #include <linux/smiapp.h>
> #include <linux/v4l2-mediabus.h>
> +#include <media/mipi-csi2.h>
> #include <media/v4l2-cci.h>
> #include <media/v4l2-device.h>
> #include <media/v4l2-fwnode.h>
> @@ -245,6 +246,33 @@ static int ccs_read_all_limits(struct ccs_sensor *sensor)
> return ret;
> }
>
> +static u8 ccs_mipi_csi2_data_type(unsigned int bpp)
> +{
> + switch (bpp) {
> + case 6:
> + return MIPI_CSI2_DT_RAW6;
> + case 7:
> + return MIPI_CSI2_DT_RAW7;
> + case 8:
> + return MIPI_CSI2_DT_RAW8;
> + case 10:
> + return MIPI_CSI2_DT_RAW10;
> + case 12:
> + return MIPI_CSI2_DT_RAW12;
> + case 14:
> + return MIPI_CSI2_DT_RAW14;
> + case 16:
> + return MIPI_CSI2_DT_RAW16;
> + case 20:
> + return MIPI_CSI2_DT_RAW20;
> + case 24:
> + return MIPI_CSI2_DT_RAW24;
> + default:
> + WARN_ON(1);
> + return 0;
> + }
> +}
> +
> static int ccs_read_frame_fmt(struct ccs_sensor *sensor)
> {
> struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd);
> @@ -2633,6 +2661,34 @@ static int ccs_set_selection(struct v4l2_subdev *subdev,
> return ret;
> }
>
> +static int ccs_get_frame_desc(struct v4l2_subdev *subdev, unsigned int pad,
> + struct v4l2_mbus_frame_desc *desc)
> +{
> + struct ccs_sensor *sensor = to_ccs_sensor(subdev);
> + struct v4l2_mbus_frame_desc_entry *entry = desc->entry;
> +
> + switch (sensor->hwcfg.csi_signalling_mode) {
> + case CCS_CSI_SIGNALING_MODE_CSI_2_DPHY:
> + case CCS_CSI_SIGNALING_MODE_CSI_2_CPHY:
> + desc->type = V4L2_MBUS_FRAME_DESC_TYPE_CSI2;
> + break;
> + default:
> + /* FIXME: CCP2 support */
> + return -EINVAL;
> + }
> +
> + entry->pixelcode = sensor->csi_format->code;
> + entry->stream = CCS_STREAM_PIXEL;
> + entry->bus.csi2.dt =
> + sensor->csi_format->width == sensor->csi_format->compressed ?
> + ccs_mipi_csi2_data_type(sensor->csi_format->width) :
> + CCS_DEFAULT_COMPRESSED_DT;
> + entry++;
> + desc->num_entries++;
> +
> + return 0;
> +}
> +
> static int ccs_get_skip_frames(struct v4l2_subdev *subdev, u32 *frames)
> {
> struct ccs_sensor *sensor = to_ccs_sensor(subdev);
> @@ -3055,6 +3111,7 @@ static const struct v4l2_subdev_pad_ops ccs_pad_ops = {
> .set_selection = ccs_set_selection,
> .enable_streams = ccs_enable_streams,
> .disable_streams = ccs_disable_streams,
> + .get_frame_desc = ccs_get_frame_desc,
> };
>
> static const struct v4l2_subdev_sensor_ops ccs_sensor_ops = {
> diff --git a/drivers/media/i2c/ccs/ccs.h b/drivers/media/i2c/ccs/ccs.h
> index 4725e6eca8d0..90b442a3d53e 100644
> --- a/drivers/media/i2c/ccs/ccs.h
> +++ b/drivers/media/i2c/ccs/ccs.h
> @@ -46,6 +46,8 @@
>
> #define CCS_COLOUR_COMPONENTS 4
>
> +#define CCS_DEFAULT_COMPRESSED_DT MIPI_CSI2_DT_USER_DEFINED(0)
> +
> #define SMIAPP_NAME "smiapp"
> #define CCS_NAME "ccs"
>
> @@ -175,6 +177,8 @@ struct ccs_csi_data_format {
> #define CCS_PAD_SRC 1
> #define CCS_PADS 2
>
> +#define CCS_STREAM_PIXEL 0
> +
> struct ccs_binning_subtype {
> u8 horizontal:4;
> u8 vertical:4;
--
Regards,
Laurent Pinchart
