Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f223c30f authored by Florian Echtler's avatar Florian Echtler Committed by Mauro Carvalho Chehab
Browse files

[media] sur40: properly report a single frame rate of 60 FPS 



The device hardware is always running at 60 FPS, so report this both via
PARM_IOCTL and ENUM_FRAMEINTERVALS.

[hans.verkuil@cisco.com: fix suspect indent checkpatch warning]
[mchehab@s-opensource.com: fix a trivial merge conflict]

Signed-off-by: default avatarMartin Kaltenbrunner <modin@yuri.at>
Signed-off-by: default avatarFlorian Echtler <floe@butterbrot.org>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent f22bede3

drivers/input/touchscreen/sur40.c

+18 −2
Original line number Diff line number Diff line
@@ -839,6 +839,19 @@ static int sur40_vidioc_g_fmt(struct file *file, void *priv, 
	return 0;

}



static int sur40_ioctl_parm(struct file *file, void *priv,

			    struct v4l2_streamparm *p)

{

	if (p->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

		return -EINVAL;



	p->parm.capture.capability = V4L2_CAP_TIMEPERFRAME;

	p->parm.capture.timeperframe.numerator = 1;

	p->parm.capture.timeperframe.denominator = 60;

	p->parm.capture.readbuffers = 3;

	return 0;

}



static int sur40_vidioc_enum_fmt(struct file *file, void *priv,

				 struct v4l2_fmtdesc *f)

{
@@ -870,14 +883,14 @@ static int sur40_vidioc_enum_frameintervals(struct file *file, void *priv, 
{

	struct sur40_state *sur40 = video_drvdata(file);



	if ((f->index > 1) || ((f->pixel_format != V4L2_TCH_FMT_TU08)

	if ((f->index > 0) || ((f->pixel_format != V4L2_TCH_FMT_TU08)

		&& (f->pixel_format != V4L2_PIX_FMT_GREY))

		|| (f->width  != sur40->pix_fmt.width)

		|| (f->height != sur40->pix_fmt.height))

		return -EINVAL;



	f->type = V4L2_FRMIVAL_TYPE_DISCRETE;

	f->discrete.denominator  = 60/(f->index+1);

	f->discrete.denominator  = 60;

	f->discrete.numerator = 1;

	return 0;

}
@@ -937,6 +950,9 @@ static const struct v4l2_ioctl_ops sur40_video_ioctl_ops = { 
	.vidioc_enum_framesizes = sur40_vidioc_enum_framesizes,

	.vidioc_enum_frameintervals = sur40_vidioc_enum_frameintervals,



	.vidioc_g_parm = sur40_ioctl_parm,

	.vidioc_s_parm = sur40_ioctl_parm,



	.vidioc_enum_input	= sur40_vidioc_enum_input,

	.vidioc_g_input		= sur40_vidioc_g_input,

	.vidioc_s_input		= sur40_vidioc_s_input,