media: rockchip: vicap add CSI RGB888 format input support

Signed-off-by: Jianwei Fan <[email protected]>
Change-Id: Iaaaf63a380e3c8de461f1c5a651a1f7efc313773

Author: potugas

drivers/media/platform/rockchip/cif/capture.c

@@ -595,7 +595,7 @@ static struct rkcif_sensor_info *sd_to_sensor(struct rkcif_device *dev,
 	return NULL;
 }
 
-static unsigned char get_data_type(u32 pixelformat, u8 cmd_mode_en)
+static unsigned char get_data_type(u32 pixelformat, u8 cmd_mode_en, u8 dsi_input)
 {
 	switch (pixelformat) {
 	/* csi raw8 */
@@ -622,12 +622,15 @@ static unsigned char get_data_type(u32 pixelformat, u8 cmd_mode_en)
 	case MEDIA_BUS_FMT_YUYV8_2X8:
 	case MEDIA_BUS_FMT_YVYU8_2X8:
 		return 0x1e;
-	case MEDIA_BUS_FMT_RGB888_1X24: {
-		if (cmd_mode_en) /* dsi command mode*/
-			return 0x39;
-		else /* dsi video mode */
-			return 0x3e;
-	}
+	case MEDIA_BUS_FMT_RGB888_1X24:
+		if (dsi_input) {
+			if (cmd_mode_en) /* dsi command mode*/
+				return 0x39;
+			else /* dsi video mode */
+				return 0x3e;
+		} else {
+			return 0x24;
+		}
 	case MEDIA_BUS_FMT_EBD_1X8:
 		return 0x12;
 	case MEDIA_BUS_FMT_SPD_2X8:
@@ -2089,6 +2092,7 @@ static int rkcif_csi_channel_init(struct rkcif_stream *stream,
 	channel->fmt_val = stream->cif_fmt_out->csi_fmt_val;
 
 	channel->cmd_mode_en = 0; /* default use DSI Video Mode */
+	channel->dsi_input = dev->terminal_sensor.dsi_input_en;
 
 	if (stream->crop_enable) {
 		channel->crop_en = 1;
@@ -2157,10 +2161,12 @@ static int rkcif_csi_channel_init(struct rkcif_stream *stream,
 			channel->data_type = dev->channels[stream->id].data_type;
 		else
 			channel->data_type = get_data_type(stream->cif_fmt_in->mbus_code,
-							   channel->cmd_mode_en);
+							   channel->cmd_mode_en,
+							   channel->dsi_input);
 	} else {
 		channel->data_type = get_data_type(stream->cif_fmt_in->mbus_code,
-						   channel->cmd_mode_en);
+						   channel->cmd_mode_en,
+						   channel->dsi_input);
 	}
 	channel->csi_fmt_val = get_csi_fmt_val(stream->cif_fmt_in,
 					       &dev->channels[stream->id]);
@@ -3808,6 +3814,13 @@ int rkcif_update_sensor_info(struct rkcif_stream *stream)
 				 __func__, terminal_sensor->sd->name);
 			return ret;
 		}
+		if (v4l2_subdev_call(terminal_sensor->sd, core, ioctl, RKMODULE_GET_CSI_DSI_INFO,
+					&terminal_sensor->dsi_input_en)) {
+			v4l2_dbg(1, rkcif_debug, &stream->cifdev->v4l2_dev,
+				"%s: get terminal %s CSI/DSI sel failed, default csi input!\n",
+				__func__, terminal_sensor->sd->name);
+			terminal_sensor->dsi_input_en = 0;
+		}
 	} else {
 		v4l2_err(&stream->cifdev->v4l2_dev,
 			 "%s: stream[%d] get remote terminal sensor failed!\n",

drivers/media/platform/rockchip/cif/dev.h

@@ -220,6 +220,7 @@ struct rkcif_sensor_info {
 	int lanes;
 	struct v4l2_rect raw_rect;
 	struct v4l2_subdev_selection selection;
+	int dsi_input_en;
 };
 
 enum cif_fmt_type {
@@ -283,6 +284,7 @@ struct csi_channel_info {
 	unsigned int virtual_width;
 	unsigned int crop_st_x;
 	unsigned int crop_st_y;
+	unsigned int dsi_input;
 	struct rkmodule_lvds_cfg lvds_cfg;
 };
 

drivers/media/platform/rockchip/cif/mipi-csi2.c

@@ -15,6 +15,8 @@
 #include <linux/of_graph.h>
 #include <linux/platform_device.h>
 #include <linux/reset.h>
+#include <linux/rk-camera-module.h>
+#include <media/v4l2-ioctl.h>
 #include "mipi-csi2.h"
 
 static int csi2_debug;
@@ -69,9 +71,41 @@ static struct v4l2_subdev *get_remote_sensor(struct v4l2_subdev *sd)
 	return media_entity_to_v4l2_subdev(sensor_me);
 }
 
+static void get_remote_terminal_sensor(struct v4l2_subdev *sd,
+				       struct v4l2_subdev **sensor_sd)
+{
+	struct media_graph graph;
+	struct media_entity *entity = &sd->entity;
+	struct media_device *mdev = entity->graph_obj.mdev;
+	int ret;
+
+	/* Walk the graph to locate sensor nodes. */
+	mutex_lock(&mdev->graph_mutex);
+	ret = media_graph_walk_init(&graph, mdev);
+	if (ret) {
+		mutex_unlock(&mdev->graph_mutex);
+		*sensor_sd = NULL;
+		return;
+	}
+
+	media_graph_walk_start(&graph, entity);
+	while ((entity = media_graph_walk_next(&graph))) {
+		if (entity->function == MEDIA_ENT_F_CAM_SENSOR)
+			break;
+	}
+	mutex_unlock(&mdev->graph_mutex);
+	media_graph_walk_cleanup(&graph);
+
+	if (entity)
+		*sensor_sd = media_entity_to_v4l2_subdev(entity);
+	else
+		*sensor_sd = NULL;
+}
+
 static void csi2_update_sensor_info(struct csi2_dev *csi2)
 {
 	struct csi2_sensor *sensor = &csi2->sensors[0];
+	struct v4l2_subdev *terminal_sensor_sd = NULL;
 	struct v4l2_mbus_config mbus;
 	int ret = 0;
 
@@ -81,6 +115,14 @@ static void csi2_update_sensor_info(struct csi2_dev *csi2)
 		return;
 	}
 
+	get_remote_terminal_sensor(&csi2->sd, &terminal_sensor_sd);
+	ret = v4l2_subdev_call(terminal_sensor_sd, core, ioctl,
+				RKMODULE_GET_CSI_DSI_INFO, &csi2->dsi_input_en);
+	if (ret) {
+		v4l2_dbg(1, csi2_debug, &csi2->sd, "get CSI/DSI sel failed, default csi!\n");
+		csi2->dsi_input_en = 0;
+	}
+
 	csi2->bus.flags = mbus.flags;
 	switch (csi2->bus.flags & V4L2_MBUS_CSI2_LANES) {
 	case V4L2_MBUS_CSI2_1_LANE:
@@ -193,7 +235,7 @@ static int csi2_start(struct csi2_dev *csi2)
 
 	csi2_update_sensor_info(csi2);
 
-	if (csi2->format_mbus.code == MEDIA_BUS_FMT_RGB888_1X24)
+	if (csi2->dsi_input_en == RKMODULE_DSI_INPUT)
 		host_type = RK_DSI_RXHOST;
 	else
 		host_type = RK_CSI_RXHOST;

drivers/media/platform/rockchip/cif/mipi-csi2.h

@@ -156,6 +156,7 @@ struct csi2_dev {
 	int			irq2;
 	bool			is_check_sot_sync;
 	const char		*dev_name;
+	int			dsi_input_en;
 };
 
 u32 rkcif_csi2_get_sof(struct csi2_dev *csi2_dev);

include/uapi/linux/rk-camera-module.h

@@ -156,6 +156,9 @@
 #define RKMODULE_GET_CSI_DPHY_PARAM       \
 	_IOWR('V', BASE_VIDIOC_PRIVATE + 32, struct rkmodule_csi_dphy_param)
 
+#define RKMODULE_GET_CSI_DSI_INFO       \
+	_IOWR('V', BASE_VIDIOC_PRIVATE + 33, __u32)
+
 struct rkmodule_i2cdev_info {
 	u8 slave_addr;
 } __attribute__ ((packed));
@@ -419,6 +422,14 @@ enum hdr_esp_mode {
 	HDR_ID_CODE,
 };
 
+/*
+ * CSI/DSI input select IOCTL
+ */
+enum rkmodule_csi_dsi_seq {
+	RKMODULE_CSI_INPUT = 0,
+	RKMODULE_DSI_INPUT,
+};
+
 /**
  * lcnt: line counter
  *     padnum: the pixels of padding row