[media] vpif_capture: separate subdev from input (178cce12) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/media/platform/davinci/vpif_capture.c

+111 −128

Original line number	Original line	Diff line number	Diff line
	@@ -864,13 +864,11 @@ static unsigned int vpif_poll(struct file filep, poll_table wait)
	*/		*/
	static int vpif_open(struct file *filep)		static int vpif_open(struct file *filep)
	{		{
	struct vpif_capture_config *config = vpif_dev->platform_data;
	struct video_device *vdev = video_devdata(filep);		struct video_device *vdev = video_devdata(filep);
	struct common_obj *common;		struct common_obj *common;
	struct video_obj *vid_ch;		struct video_obj *vid_ch;
	struct channel_obj *ch;		struct channel_obj *ch;
	struct vpif_fh *fh;		struct vpif_fh *fh;
	int i;

	vpif_dbg(2, debug, "vpif_open\n");		vpif_dbg(2, debug, "vpif_open\n");

	@@ -879,24 +877,6 @@ static int vpif_open(struct file *filep)
	vid_ch = &ch->video;		vid_ch = &ch->video;
	common = &ch->common[VPIF_VIDEO_INDEX];		common = &ch->common[VPIF_VIDEO_INDEX];

	if (NULL == ch->curr_subdev_info) {
	/**
	* search through the sub device to see a registered
	* sub device and make it as current sub device
	*/
	for (i = 0; i < config->subdev_count; i++) {
	if (vpif_obj.sd[i]) {
	/* the sub device is registered */
	ch->curr_subdev_info = &config->subdev_info[i];
	break;
	}
	}
	if (i == config->subdev_count) {
	vpif_err("No sub device registered\n");
	return -ENOENT;
	}
	}

	/* Allocate memory for the file handle object */		/* Allocate memory for the file handle object */
	fh = kzalloc(sizeof(struct vpif_fh), GFP_KERNEL);		fh = kzalloc(sizeof(struct vpif_fh), GFP_KERNEL);
	if (NULL == fh) {		if (NULL == fh) {
	@@ -1174,10 +1154,9 @@ static int vpif_streamon(struct file file, void priv,
	return ret;		return ret;

	/* Enable streamon on the sub device */		/* Enable streamon on the sub device */
	ret = v4l2_subdev_call(vpif_obj.sd[ch->curr_sd_index], video,		ret = v4l2_subdev_call(ch->sd, video, s_stream, 1);
	s_stream, 1);

	if (ret && (ret != -ENOIOCTLCMD)) {		if (ret && ret != -ENOIOCTLCMD && ret != -ENODEV) {
	vpif_dbg(1, debug, "stream on failed in subdev\n");		vpif_dbg(1, debug, "stream on failed in subdev\n");
	return ret;		return ret;
	}		}
	@@ -1237,73 +1216,105 @@ static int vpif_streamoff(struct file file, void priv,

	common->started = 0;		common->started = 0;

	ret = v4l2_subdev_call(vpif_obj.sd[ch->curr_sd_index], video,		ret = v4l2_subdev_call(ch->sd, video, s_stream, 0);
	s_stream, 0);

	if (ret && (ret != -ENOIOCTLCMD))		if (ret && ret != -ENOIOCTLCMD && ret != -ENODEV)
	vpif_dbg(1, debug, "stream off failed in subdev\n");		vpif_dbg(1, debug, "stream off failed in subdev\n");

	return vb2_streamoff(&common->buffer_queue, buftype);		return vb2_streamoff(&common->buffer_queue, buftype);
	}		}

	/**		/**
	* vpif_map_sub_device_to_input() - Maps sub device to input		* vpif_input_to_subdev() - Maps input to sub device
	* @ch - ptr to channel		* @vpif_cfg - global config ptr
	* @config - ptr to capture configuration		* @chan_cfg - channel config ptr
	* @input_index - Given input index from application		* @input_index - Given input index from application
	* @sub_device_index - index into sd table
	*		*
	* lookup the sub device information for a given input index.		* lookup the sub device information for a given input index.
	* we report all the inputs to application. inputs table also		* we report all the inputs to application. inputs table also
	* has sub device name for the each input		* has sub device name for the each input
	*/		*/
	static struct vpif_subdev_info *vpif_map_sub_device_to_input(		static int vpif_input_to_subdev(
	struct channel_obj *ch,
	struct vpif_capture_config *vpif_cfg,		struct vpif_capture_config *vpif_cfg,
	int input_index,		struct vpif_capture_chan_config *chan_cfg,
	int *sub_device_index)		int input_index)
	{		{
	struct vpif_capture_chan_config *chan_cfg;		struct vpif_subdev_info *subdev_info;
	struct vpif_subdev_info *subdev_info = NULL;		const char *subdev_name;
	const char *subdev_name = NULL;
	int i;		int i;

	vpif_dbg(2, debug, "vpif_map_sub_device_to_input\n");		vpif_dbg(2, debug, "vpif_input_to_subdev\n");

	chan_cfg = &vpif_cfg->chan_config[ch->channel_id];

	/**		subdev_name = chan_cfg->inputs[input_index].subdev_name;
	* search through the inputs to find the sub device supporting		if (subdev_name == NULL)
	* the input		return -1;
	*/
	for (i = 0; i < chan_cfg->input_count; i++) {
	/* For each sub device, loop through input */
	if (i == input_index) {
	subdev_name = chan_cfg->inputs[i].subdev_name;
	break;
	}
	}

	/* if reached maximum. return null */
	if (i == chan_cfg->input_count \|\| (NULL == subdev_name))
	return subdev_info;

	/* loop through the sub device list to get the sub device info */		/* loop through the sub device list to get the sub device info */
	for (i = 0; i < vpif_cfg->subdev_count; i++) {		for (i = 0; i < vpif_cfg->subdev_count; i++) {
	subdev_info = &vpif_cfg->subdev_info[i];		subdev_info = &vpif_cfg->subdev_info[i];
	if (!strcmp(subdev_info->name, subdev_name))		if (!strcmp(subdev_info->name, subdev_name))
	break;		return i;
			}
			return -1;
	}		}

	if (i == vpif_cfg->subdev_count)		/**
	return subdev_info;		* vpif_set_input() - Select an input
			* @vpif_cfg - global config ptr
			* @ch - channel
			* @_index - Given input index from application
			*
			* Select the given input.
			*/
			static int vpif_set_input(
			struct vpif_capture_config *vpif_cfg,
			struct channel_obj *ch,
			int index)
			{
			struct vpif_capture_chan_config *chan_cfg =
			&vpif_cfg->chan_config[ch->channel_id];
			struct vpif_subdev_info *subdev_info = NULL;
			struct v4l2_subdev *sd = NULL;
			u32 input = 0, output = 0;
			int sd_index;
			int ret;

			sd_index = vpif_input_to_subdev(vpif_cfg, chan_cfg, index);
			if (sd_index >= 0) {
			sd = vpif_obj.sd[sd_index];
			subdev_info = &vpif_cfg->subdev_info[sd_index];
			}

	/* check if the sub device is registered */		/* first setup input path from sub device to vpif */
	if (NULL == vpif_obj.sd[i])		if (sd && vpif_cfg->setup_input_path) {
	return NULL;		ret = vpif_cfg->setup_input_path(ch->channel_id,
			subdev_info->name);
			if (ret < 0) {
			vpif_dbg(1, debug, "couldn't setup input path for the" \
			" sub device %s, for input index %d\n",
			subdev_info->name, index);
			return ret;
			}
			}

	*sub_device_index = i;		if (sd) {
	return subdev_info;		input = chan_cfg->inputs[index].input_route;
			output = chan_cfg->inputs[index].output_route;
			ret = v4l2_subdev_call(sd, video, s_routing,
			input, output, 0);
			if (ret < 0 && ret != -ENOIOCTLCMD) {
			vpif_dbg(1, debug, "Failed to set input\n");
			return ret;
			}
			}
			ch->input_idx = index;
			ch->sd = sd;
			/* copy interface parameters to vpif */
			ch->vpifparams.iface = subdev_info->vpif_if;

			/* update tvnorms from the sub device input info */
			ch->video_dev->tvnorms = chan_cfg->inputs[index].input.std;
			return 0;
	}		}

	/**		/**
	@@ -1323,14 +1334,18 @@ static int vpif_querystd(struct file file, void priv, v4l2_std_id *std_id)
	vpif_dbg(2, debug, "vpif_querystd\n");		vpif_dbg(2, debug, "vpif_querystd\n");

	/* Call querystd function of decoder device */		/* Call querystd function of decoder device */
	ret = v4l2_subdev_call(vpif_obj.sd[ch->curr_sd_index], video,		ret = v4l2_subdev_call(ch->sd, video, querystd, std_id);
	querystd, std_id);
	if (ret < 0)
	vpif_dbg(1, debug, "Failed to set standard for sub devices\n");

			if (ret == -ENOIOCTLCMD \|\| ret == -ENODEV)
			return -ENODATA;
			if (ret) {
			vpif_dbg(1, debug, "Failed to query standard for sub devices\n");
	return ret;		return ret;
	}		}

			return 0;
			}

	/**		/**
	* vpif_g_std() - get STD handler		* vpif_g_std() - get STD handler
	* @file: file ptr		* @file: file ptr
	@@ -1396,12 +1411,13 @@ static int vpif_s_std(struct file file, void priv, v4l2_std_id *std_id)
	vpif_config_format(ch);		vpif_config_format(ch);

	/* set standard in the sub device */		/* set standard in the sub device */
	ret = v4l2_subdev_call(vpif_obj.sd[ch->curr_sd_index], core,		ret = v4l2_subdev_call(ch->sd, core, s_std, *std_id);
	s_std, *std_id);		if (ret && ret != -ENOIOCTLCMD && ret != -ENODEV) {
	if (ret < 0)
	vpif_dbg(1, debug, "Failed to set standard for sub devices\n");		vpif_dbg(1, debug, "Failed to set standard for sub devices\n");
	return ret;		return ret;
	}		}
			return 0;
			}

	/**		/**
	* vpif_enum_input() - ENUMINPUT handler		* vpif_enum_input() - ENUMINPUT handler
	@@ -1458,9 +1474,7 @@ static int vpif_s_input(struct file file, void priv, unsigned int index)
	struct vpif_fh *fh = priv;		struct vpif_fh *fh = priv;
	struct channel_obj *ch = fh->channel;		struct channel_obj *ch = fh->channel;
	struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];		struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
	struct vpif_subdev_info *subdev_info;		int ret;
	int ret = 0, sd_index = 0;
	u32 input = 0, output = 0;

	chan_cfg = &config->chan_config[ch->channel_id];		chan_cfg = &config->chan_config[ch->channel_id];

	@@ -1485,43 +1499,7 @@ static int vpif_s_input(struct file file, void priv, unsigned int index)
	return ret;		return ret;

	fh->initialized = 1;		fh->initialized = 1;
	subdev_info = vpif_map_sub_device_to_input(ch, config, index,		return vpif_set_input(config, ch, index);
	&sd_index);
	if (NULL == subdev_info) {
	vpif_dbg(1, debug,
	"couldn't lookup sub device for the input index\n");
	return -EINVAL;
	}

	/* first setup input path from sub device to vpif */
	if (config->setup_input_path) {
	ret = config->setup_input_path(ch->channel_id,
	subdev_info->name);
	if (ret < 0) {
	vpif_dbg(1, debug, "couldn't setup input path for the"
	" sub device %s, for input index %d\n",
	subdev_info->name, index);
	return ret;
	}
	}

	input = chan_cfg->inputs[index].input_route;
	output = chan_cfg->inputs[index].output_route;
	ret = v4l2_subdev_call(vpif_obj.sd[sd_index], video, s_routing,
	input, output, 0);
	if (ret < 0 && ret != -ENOIOCTLCMD) {
	vpif_dbg(1, debug, "Failed to set input\n");
	return ret;
	}
	ch->input_idx = index;
	ch->curr_subdev_info = subdev_info;
	ch->curr_sd_index = sd_index;
	/* copy interface parameters to vpif */
	ch->vpifparams.iface = subdev_info->vpif_if;

	/* update tvnorms from the sub device input info */
	ch->video_dev->tvnorms = chan_cfg->inputs[index].input.std;
	return 0;
	}		}

	/**		/**
	@@ -1727,9 +1705,12 @@ vpif_enum_dv_timings(struct file file, void priv,
	{		{
	struct vpif_fh *fh = priv;		struct vpif_fh *fh = priv;
	struct channel_obj *ch = fh->channel;		struct channel_obj *ch = fh->channel;
			int ret;

	return v4l2_subdev_call(vpif_obj.sd[ch->curr_sd_index],		ret = v4l2_subdev_call(ch->sd, video, enum_dv_timings, timings);
	video, enum_dv_timings, timings);		if (ret == -ENOIOCTLCMD && ret == -ENODEV)
			return -EINVAL;
			return ret;
	}		}

	/**		/**
	@@ -1744,9 +1725,12 @@ vpif_query_dv_timings(struct file file, void priv,
	{		{
	struct vpif_fh *fh = priv;		struct vpif_fh *fh = priv;
	struct channel_obj *ch = fh->channel;		struct channel_obj *ch = fh->channel;
			int ret;

	return v4l2_subdev_call(vpif_obj.sd[ch->curr_sd_index],		ret = v4l2_subdev_call(ch->sd, video, query_dv_timings, timings);
	video, query_dv_timings, timings);		if (ret == -ENOIOCTLCMD && ret == -ENODEV)
			return -ENODATA;
			return ret;
	}		}

	/**		/**
	@@ -1772,13 +1756,9 @@ static int vpif_s_dv_timings(struct file file, void priv,
	}		}

	/* Configure subdevice timings, if any */		/* Configure subdevice timings, if any */
	ret = v4l2_subdev_call(vpif_obj.sd[ch->curr_sd_index],		ret = v4l2_subdev_call(ch->sd, video, s_dv_timings, timings);
	video, s_dv_timings, timings);		if (ret == -ENOIOCTLCMD \|\| ret == -ENODEV)
	if (ret == -ENOIOCTLCMD) {		ret = 0;
	vpif_dbg(2, debug, "Custom DV timings not supported by "
	"subdevice\n");
	return -EINVAL;
	}
	if (ret < 0) {		if (ret < 0) {
	vpif_dbg(2, debug, "Error setting custom DV timings\n");		vpif_dbg(2, debug, "Error setting custom DV timings\n");
	return ret;		return ret;
	@@ -1903,8 +1883,7 @@ static int vpif_dbg_g_register(struct file file, void priv,
	struct vpif_fh *fh = priv;		struct vpif_fh *fh = priv;
	struct channel_obj *ch = fh->channel;		struct channel_obj *ch = fh->channel;

	return v4l2_subdev_call(vpif_obj.sd[ch->curr_sd_index], core,		return v4l2_subdev_call(ch->sd, core, g_register, reg);
	g_register, reg);
	}		}

	/*		/*
	@@ -1921,8 +1900,7 @@ static int vpif_dbg_s_register(struct file file, void priv,
	struct vpif_fh *fh = priv;		struct vpif_fh *fh = priv;
	struct channel_obj *ch = fh->channel;		struct channel_obj *ch = fh->channel;

	return v4l2_subdev_call(vpif_obj.sd[ch->curr_sd_index], core,		return v4l2_subdev_call(ch->sd, core, s_register, reg);
	s_register, reg);
	}		}
	#endif		#endif

	@@ -2180,6 +2158,11 @@ static __init int vpif_probe(struct platform_device *pdev)
	v4l2_prio_init(&ch->prio);		v4l2_prio_init(&ch->prio);
	video_set_drvdata(ch->video_dev, ch);		video_set_drvdata(ch->video_dev, ch);

			/* select input 0 */
			err = vpif_set_input(config, ch, 0);
			if (err)
			goto probe_out;

	err = video_register_device(ch->video_dev,		err = video_register_device(ch->video_dev,
	VFL_TYPE_GRABBER, (j ? 1 : 0));		VFL_TYPE_GRABBER, (j ? 1 : 0));
	if (err)		if (err)

drivers/media/platform/davinci/vpif_capture.h

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -117,12 +117,10 @@ struct channel_obj {
	u8 initialized;		u8 initialized;
	/* Identifies channel */		/* Identifies channel */
	enum vpif_channel_id channel_id;		enum vpif_channel_id channel_id;
	/* index into sd table */
	int curr_sd_index;
	/* Current input */		/* Current input */
	u32 input_idx;		u32 input_idx;
	/* ptr to current sub device information */		/* subdev corresponding to the current input, may be NULL */
	struct vpif_subdev_info *curr_subdev_info;		struct v4l2_subdev *sd;
	/* vpif configuration params */		/* vpif configuration params */
	struct vpif_params vpifparams;		struct vpif_params vpifparams;
	/* common object array */		/* common object array */