kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/media/i2c/imx317.c
..
..
@@ -845,9 +845,7 @@
845
845
 	struct imx317 *imx317 = to_imx317(sd);
846
846
 	const struct imx317_mode *mode = imx317->cur_mode;
847
847
 
848
-	mutex_lock(&imx317->mutex);
849
848
 	fi->interval = mode->max_fps;
850
-	mutex_unlock(&imx317->mutex);
851
849
 
852
850
 	return 0;
853
851
 }
..
..
@@ -1178,16 +1176,14 @@
1178
1176
 	if (fie->index >= imx317->cfg_num)
1179
1177
 		return -EINVAL;
1180
1178
 
1181
-	if (fie->code != IMX317_MEDIA_BUS_FMT)
1182
-		return -EINVAL;
1183
-
1179
+	fie->code = IMX317_MEDIA_BUS_FMT;
1184
1180
 	fie->width = supported_modes[fie->index].width;
1185
1181
 	fie->height = supported_modes[fie->index].height;
1186
1182
 	fie->interval = supported_modes[fie->index].max_fps;
1187
1183
 	return 0;
1188
1184
 }
1189
1185
 
1190
-static int imx317_g_mbus_config(struct v4l2_subdev *sd,
1186
+static int imx317_g_mbus_config(struct v4l2_subdev *sd, unsigned int pad_id,
1191
1187
 				struct v4l2_mbus_config *config)
1192
1188
 {
1193
1189
 	u32 val = 0;
..
..
@@ -1196,7 +1192,7 @@
1196
1192
 	val = 1 << (imx317->lane_num - 1) |
1197
1193
 	      V4L2_MBUS_CSI2_CHANNEL_0 |
1198
1194
 	      V4L2_MBUS_CSI2_CONTINUOUS_CLOCK;
1199
-	config->type = V4L2_MBUS_CSI2;
1195
+	config->type = V4L2_MBUS_CSI2_DPHY;
1200
1196
 	config->flags = val;
1201
1197
 
1202
1198
 	return 0;
..
..
@@ -1224,7 +1220,6 @@
1224
1220
 static const struct v4l2_subdev_video_ops imx317_video_ops = {
1225
1221
 	.s_stream = imx317_s_stream,
1226
1222
 	.g_frame_interval = imx317_g_frame_interval,
1227
-	.g_mbus_config = imx317_g_mbus_config,
1228
1223
 };
1229
1224
 
1230
1225
 static const struct v4l2_subdev_pad_ops imx317_pad_ops = {
..
..
@@ -1233,6 +1228,7 @@
1233
1228
 	.enum_frame_interval = imx317_enum_frame_interval,
1234
1229
 	.get_fmt = imx317_get_fmt,
1235
1230
 	.set_fmt = imx317_set_fmt,
1231
+	.get_mbus_config = imx317_g_mbus_config,
1236
1232
 };
1237
1233
 
1238
1234
 static const struct v4l2_subdev_ops imx317_subdev_ops = {