Commit 6c396c28 authored by Johan Korsnes's avatar Johan Korsnes Committed by Mauro Carvalho Chehab
Browse files

media: vivid: make input std_signal per-input 



Make the following properties per-input:

-Standard Signal Mode
-Standard

These properties need to be per-input in order to implement proper HDMI
(dis)connect-behavior, where the signal mode will be used to signify
whether or not there is an inpute device connected.

Signed-off-by: default avatarJohan Korsnes <johan.korsnes@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 448e1153

drivers/media/platform/vivid/vivid-core.c

+3 −2
Original line number Diff line number Diff line
@@ -999,14 +999,15 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) 
	dev->webcam_size_idx = 1;

	dev->webcam_ival_idx = 3;

	tpg_s_fourcc(&dev->tpg, dev->fmt_cap->fourcc);

	dev->std_cap = V4L2_STD_PAL;

	dev->std_out = V4L2_STD_PAL;

	if (dev->input_type[0] == TV || dev->input_type[0] == SVID)

		tvnorms_cap = V4L2_STD_ALL;

	if (dev->output_type[0] == SVID)

		tvnorms_out = V4L2_STD_ALL;

	for (i = 0; i < MAX_INPUTS; i++)

	for (i = 0; i < MAX_INPUTS; i++) {

		dev->dv_timings_cap[i] = def_dv_timings;

		dev->std_cap[i] = V4L2_STD_PAL;

	}

	dev->dv_timings_out = def_dv_timings;

	dev->tv_freq = 2804 /* 175.25 * 16 */;

	dev->tv_audmode = V4L2_TUNER_MODE_STEREO;

drivers/media/platform/vivid/vivid-core.h

+5 −5
Original line number Diff line number Diff line
@@ -287,10 +287,10 @@ struct vivid_dev { 
	bool				time_wrap;

	u64				time_wrap_offset;

	unsigned			perc_dropped_buffers;

	enum vivid_signal_mode		std_signal_mode;

	unsigned			query_std_last;

	v4l2_std_id			query_std;

	enum tpg_video_aspect		std_aspect_ratio;

	enum vivid_signal_mode		std_signal_mode[MAX_INPUTS];

	unsigned int			query_std_last[MAX_INPUTS];

	v4l2_std_id			query_std[MAX_INPUTS];

	enum tpg_video_aspect		std_aspect_ratio[MAX_INPUTS];



	enum vivid_signal_mode		dv_timings_signal_mode[MAX_INPUTS];

	char				**query_dv_timings_qmenu;
@@ -302,7 +302,7 @@ struct vivid_dev { 


	/* Input */

	unsigned			input;

	v4l2_std_id			std_cap;

	v4l2_std_id			std_cap[MAX_INPUTS];

	struct v4l2_dv_timings		dv_timings_cap[MAX_INPUTS];

	int				dv_timings_cap_sel[MAX_INPUTS];

	u32				service_set_cap;

drivers/media/platform/vivid/vivid-ctrls.c

+9 −5
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ static int vivid_vid_cap_s_ctrl(struct v4l2_ctrl *ctrl) 
		tpg_s_show_square(&dev->tpg, ctrl->val);

		break;

	case VIVID_CID_STD_ASPECT_RATIO:

		dev->std_aspect_ratio = ctrl->val;

		dev->std_aspect_ratio[dev->input] = ctrl->val;

		tpg_s_video_aspect(&dev->tpg, vivid_get_video_aspect(dev));

		break;

	case VIVID_CID_DV_TIMINGS_SIGNAL_MODE:
@@ -1130,10 +1130,14 @@ static int vivid_sdtv_cap_s_ctrl(struct v4l2_ctrl *ctrl) 


	switch (ctrl->id) {

	case VIVID_CID_STD_SIGNAL_MODE:

		dev->std_signal_mode = dev->ctrl_std_signal_mode->val;

		if (dev->std_signal_mode == SELECTED_STD)

			dev->query_std = vivid_standard[dev->ctrl_standard->val];

		v4l2_ctrl_activate(dev->ctrl_standard, dev->std_signal_mode == SELECTED_STD);

		dev->std_signal_mode[dev->input] =

			dev->ctrl_std_signal_mode->val;

		if (dev->std_signal_mode[dev->input] == SELECTED_STD)

			dev->query_std[dev->input] =

				vivid_standard[dev->ctrl_standard->val];

		v4l2_ctrl_activate(dev->ctrl_standard,

				   dev->std_signal_mode[dev->input] ==

					SELECTED_STD);

		vivid_update_quality(dev);

		vivid_send_source_change(dev, TV);

		vivid_send_source_change(dev, SVID);

drivers/media/platform/vivid/vivid-kthread-cap.c

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
static inline v4l2_std_id vivid_get_std_cap(const struct vivid_dev *dev)

{

	if (vivid_is_sdtv_cap(dev))

		return dev->std_cap;

		return dev->std_cap[dev->input];

	return 0;

}
@@ -408,7 +408,7 @@ static void vivid_fillbuff(struct vivid_dev *dev, struct vivid_buffer *buf) 
	unsigned factor = V4L2_FIELD_HAS_T_OR_B(dev->field_cap) ? 2 : 1;

	unsigned line_height = 16 / factor;

	bool is_tv = vivid_is_sdtv_cap(dev);

	bool is_60hz = is_tv && (dev->std_cap & V4L2_STD_525_60);

	bool is_60hz = is_tv && (dev->std_cap[dev->input] & V4L2_STD_525_60);

	unsigned p;

	int line = 1;

	u8 *basep[TPG_MAX_PLANES][2];
@@ -419,7 +419,7 @@ static void vivid_fillbuff(struct vivid_dev *dev, struct vivid_buffer *buf) 


	if (dev->loop_video && dev->can_loop_video &&

		((vivid_is_svid_cap(dev) &&

		!VIVID_INVALID_SIGNAL(dev->std_signal_mode)) ||

		!VIVID_INVALID_SIGNAL(dev->std_signal_mode[dev->input])) ||

		(vivid_is_hdmi_cap(dev) &&

		!VIVID_INVALID_SIGNAL(dev->dv_timings_signal_mode[dev->input]))))

		is_loop = true;

drivers/media/platform/vivid/vivid-vbi-cap.c

+8 −8
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
static void vivid_sliced_vbi_cap_fill(struct vivid_dev *dev, unsigned seqnr)

{

	struct vivid_vbi_gen_data *vbi_gen = &dev->vbi_gen;

	bool is_60hz = dev->std_cap & V4L2_STD_525_60;

	bool is_60hz = dev->std_cap[dev->input] & V4L2_STD_525_60;



	vivid_vbi_gen_sliced(vbi_gen, is_60hz, seqnr);
@@ -65,7 +65,7 @@ static void vivid_sliced_vbi_cap_fill(struct vivid_dev *dev, unsigned seqnr) 


static void vivid_g_fmt_vbi_cap(struct vivid_dev *dev, struct v4l2_vbi_format *vbi)

{

	bool is_60hz = dev->std_cap & V4L2_STD_525_60;

	bool is_60hz = dev->std_cap[dev->input] & V4L2_STD_525_60;



	vbi->sampling_rate = 27000000;

	vbi->offset = 24;
@@ -93,7 +93,7 @@ void vivid_raw_vbi_cap_process(struct vivid_dev *dev, struct vivid_buffer *buf) 


	memset(vbuf, 0x10, vb2_plane_size(&buf->vb.vb2_buf, 0));



	if (!VIVID_INVALID_SIGNAL(dev->std_signal_mode))

	if (!VIVID_INVALID_SIGNAL(dev->std_signal_mode[dev->input]))

		vivid_vbi_gen_raw(&dev->vbi_gen, &vbi, vbuf);

}
@@ -111,7 +111,7 @@ void vivid_sliced_vbi_cap_process(struct vivid_dev *dev, 
	vivid_sliced_vbi_cap_fill(dev, buf->vb.sequence);



	memset(vbuf, 0, vb2_plane_size(&buf->vb.vb2_buf, 0));

	if (!VIVID_INVALID_SIGNAL(dev->std_signal_mode)) {

	if (!VIVID_INVALID_SIGNAL(dev->std_signal_mode[dev->input])) {

		unsigned i;



		for (i = 0; i < 25; i++)
@@ -124,7 +124,7 @@ static int vbi_cap_queue_setup(struct vb2_queue *vq, 
		       unsigned sizes[], struct device *alloc_devs[])

{

	struct vivid_dev *dev = vb2_get_drv_priv(vq);

	bool is_60hz = dev->std_cap & V4L2_STD_525_60;

	bool is_60hz = dev->std_cap[dev->input] & V4L2_STD_525_60;

	unsigned size = vq->type == V4L2_BUF_TYPE_SLICED_VBI_CAPTURE ?

		36 * sizeof(struct v4l2_sliced_vbi_data) :

		1440 * 2 * (is_60hz ? 12 : 18);
@@ -144,7 +144,7 @@ static int vbi_cap_queue_setup(struct vb2_queue *vq, 
static int vbi_cap_buf_prepare(struct vb2_buffer *vb)

{

	struct vivid_dev *dev = vb2_get_drv_priv(vb->vb2_queue);

	bool is_60hz = dev->std_cap & V4L2_STD_525_60;

	bool is_60hz = dev->std_cap[dev->input] & V4L2_STD_525_60;

	unsigned size = vb->vb2_queue->type == V4L2_BUF_TYPE_SLICED_VBI_CAPTURE ?

		36 * sizeof(struct v4l2_sliced_vbi_data) :

		1440 * 2 * (is_60hz ? 12 : 18);
@@ -302,7 +302,7 @@ int vidioc_try_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_forma 
{

	struct vivid_dev *dev = video_drvdata(file);

	struct v4l2_sliced_vbi_format *vbi = &fmt->fmt.sliced;

	bool is_60hz = dev->std_cap & V4L2_STD_525_60;

	bool is_60hz = dev->std_cap[dev->input] & V4L2_STD_525_60;

	u32 service_set = vbi->service_set;



	if (!vivid_is_sdtv_cap(dev) || !dev->has_sliced_vbi_cap)
@@ -337,7 +337,7 @@ int vidioc_g_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_sliced_vbi_ 
	bool is_60hz;



	if (vdev->vfl_dir == VFL_DIR_RX) {

		is_60hz = dev->std_cap & V4L2_STD_525_60;

		is_60hz = dev->std_cap[dev->input] & V4L2_STD_525_60;

		if (!vivid_is_sdtv_cap(dev) || !dev->has_sliced_vbi_cap ||

		    cap->type != V4L2_BUF_TYPE_SLICED_VBI_CAPTURE)

			return -EINVAL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE