media: ccs: Support frame descriptors

Provide information on the frame layout using frame descriptors.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Julien Massot <julien.massot@collabora.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-core.c
index a04763adad9189eba81698a56423f9d2900c9f94..d7038f5b368972d47d984ef4e6cf5ef9b753735e 100644 (file)
--- 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 @@ out_err:
        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);
@@ -2074,10 +2102,11 @@ static void ccs_get_crop_compose(struct v4l2_subdev *subdev,
        if (crops)
                for (i = 0; i < subdev->entity.num_pads; i++)
                        crops[i] =
-                               v4l2_subdev_state_get_crop(sd_state, i);
+                               v4l2_subdev_state_get_crop(sd_state, i,
+                                                          CCS_STREAM_PIXEL);
        if (comps)
-               *comps = v4l2_subdev_state_get_compose(sd_state,
-                                                      ssd->sink_pad);
+               *comps = v4l2_subdev_state_get_compose(sd_state, ssd->sink_pad,
+                                                      CCS_STREAM_PIXEL);
 }
 
 /* Changes require propagation only on sink pad. */
@@ -2110,7 +2139,8 @@ static void ccs_propagate(struct v4l2_subdev *subdev,
                fallthrough;
        case V4L2_SEL_TGT_COMPOSE:
                *crops[CCS_PAD_SRC] = *comp;
-               fmt = v4l2_subdev_state_get_format(sd_state, CCS_PAD_SRC);
+               fmt = v4l2_subdev_state_get_format(sd_state, CCS_PAD_SRC,
+                                                  CCS_STREAM_PIXEL);
                fmt->width = comp->width;
                fmt->height = comp->height;
                if (which == V4L2_SUBDEV_FORMAT_ACTIVE && ssd == sensor->src)
@@ -2625,6 +2655,41 @@ 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;
+       struct v4l2_subdev_state *sd_state;
+
+       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;
+       }
+
+       sd_state = v4l2_subdev_lock_and_get_active_state(subdev);
+       if (!sd_state)
+               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++;
+
+       v4l2_subdev_unlock_state(sd_state);
+
+       return 0;
+}
+
 static int ccs_get_skip_frames(struct v4l2_subdev *subdev, u32 *frames)
 {
        struct ccs_sensor *sensor = to_ccs_sensor(subdev);
@@ -3046,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 518482758da63ecccd88a3900b9babf8a335e7e8..0bdb8cd3accb835443391878f8dd10c893f65c3c 100644 (file)
--- a/drivers/media/i2c/ccs/ccs.h
+++ b/drivers/media/i2c/ccs/ccs.h
@@ -48,6 +48,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"
 
@@ -177,6 +179,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;