Commit 1724dcc9 authored by Martin Tůma's avatar Martin Tůma Committed by Hans Verkuil
Browse files

media: mgb4: Add support for V4L2_CAP_TIMEPERFRAME 



Recent mgb4 firmwares have support for setting a variable framerate
independent of the signal framerate. Add/fix (the mgb4 driver already did
promote V4L2_CAP_TIMEPERFRAME, but it didn't work) support for
V4L2_CAP_TIMEPERFRAME to the driver to enable this feature.

Additionally add support for the DV timings API (VIDIOC_G_DV_TIMINGS,
VIDIOC_ENUM_DV_TIMINGS, ...) for the outputs that was missing. The timings
info is required/used for implementing the V4L2_CAP_TIMEPERFRAME
functionality.

Signed-off-by: default avatarMartin Tůma <martin.tuma@digiteqautomotive.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent a5972ea0

drivers/media/pci/mgb4/mgb4_core.c

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static int init_i2c(struct mgb4_dev *mgbdev) 
	/* create dummy clock required by the xiic-i2c adapter */

	snprintf(clk_name, sizeof(clk_name), "xiic-i2c.%d", id);

	mgbdev->i2c_clk = clk_hw_register_fixed_rate(NULL, clk_name, NULL,

						     0, 125000000);

						     0, MGB4_HW_FREQ);

	if (IS_ERR(mgbdev->i2c_clk)) {

		dev_err(dev, "failed to register I2C clock\n");

		return PTR_ERR(mgbdev->i2c_clk);

drivers/media/pci/mgb4/mgb4_core.h

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#include <linux/dmaengine.h>

#include "mgb4_regs.h"



#define MGB4_HW_FREQ 125000000



#define MGB4_VIN_DEVICES  2

#define MGB4_VOUT_DEVICES 2

drivers/media/pci/mgb4/mgb4_io.h

+19 −5
Original line number Diff line number Diff line
@@ -7,11 +7,9 @@ 
#ifndef __MGB4_IO_H__

#define __MGB4_IO_H__



#include <linux/math64.h>

#include <media/v4l2-dev.h>



#define MGB4_DEFAULT_WIDTH     1280

#define MGB4_DEFAULT_HEIGHT    640

#define MGB4_DEFAULT_PERIOD    (125000000 / 60)

#include "mgb4_core.h"



/* Register access error indication */

#define MGB4_ERR_NO_REG        0xFFFFFFFE
@@ -20,6 +18,9 @@ 
#define MGB4_ERR_QUEUE_EMPTY   0xFFFFFFFC

#define MGB4_ERR_QUEUE_FULL    0xFFFFFFFB



#define MGB4_PERIOD(numerator, denominator) \

	((u32)div_u64((MGB4_HW_FREQ * (u64)(numerator)), (denominator)))



struct mgb4_frame_buffer {

	struct vb2_v4l2_buffer vb;

	struct list_head list;
@@ -30,11 +31,24 @@ static inline struct mgb4_frame_buffer *to_frame_buffer(struct vb2_v4l2_buffer * 
	return container_of(vbuf, struct mgb4_frame_buffer, vb);

}



static inline bool has_yuv(struct mgb4_regs *video)

static inline bool has_yuv_and_timeperframe(struct mgb4_regs *video)

{

	u32 status = mgb4_read_reg(video, 0xD0);



	return (status & (1U << 8));

}



#define has_yuv(video) has_yuv_and_timeperframe(video)

#define has_timeperframe(video) has_yuv_and_timeperframe(video)



static inline u32 pixel_size(struct v4l2_dv_timings *timings)

{

	struct v4l2_bt_timings *bt = &timings->bt;



	u32 height = bt->height + bt->vfrontporch + bt->vsync + bt->vbackporch;

	u32 width = bt->width + bt->hfrontporch + bt->hsync + bt->hbackporch;



	return width * height;

}



#endif

drivers/media/pci/mgb4/mgb4_sysfs_out.c

+2 −2
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ static ssize_t frame_rate_show(struct device *dev, 
	u32 period = mgb4_read_reg(&voutdev->mgbdev->video,

				   voutdev->config->regs.frame_period);



	return sprintf(buf, "%u\n", 125000000 / period);

	return sprintf(buf, "%u\n", MGB4_HW_FREQ / period);

}



/*
@@ -252,7 +252,7 @@ static ssize_t frame_rate_store(struct device *dev, 
		return ret;



	mgb4_write_reg(&voutdev->mgbdev->video,

		       voutdev->config->regs.frame_period, 125000000 / val);

		       voutdev->config->regs.frame_period, MGB4_HW_FREQ / val);



	return count;

}

drivers/media/pci/mgb4/mgb4_vin.c

+65 −21
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/workqueue.h>

#include <linux/align.h>

#include <linux/dma/amd_xdma.h>

#include <linux/v4l2-dv-timings.h>

#include <media/v4l2-ioctl.h>

#include <media/videobuf2-v4l2.h>

#include <media/videobuf2-dma-sg.h>
@@ -34,8 +35,8 @@ ATTRIBUTE_GROUPS(mgb4_fpdl3_in); 
ATTRIBUTE_GROUPS(mgb4_gmsl_in);



static const struct mgb4_vin_config vin_cfg[] = {

	{0, 0, 0, 6, {0x10, 0x00, 0x04, 0x08, 0x1C, 0x14, 0x18, 0x20, 0x24, 0x28}},

	{1, 1, 1, 7, {0x40, 0x30, 0x34, 0x38, 0x4C, 0x44, 0x48, 0x50, 0x54, 0x58}}

	{0, 0, 0, 6, {0x10, 0x00, 0x04, 0x08, 0x1C, 0x14, 0x18, 0x20, 0x24, 0x28, 0xE8}},

	{1, 1, 1, 7, {0x40, 0x30, 0x34, 0x38, 0x4C, 0x44, 0x48, 0x50, 0x54, 0x58, 0xEC}}

};



static const struct i2c_board_info fpdl3_deser_info[] = {
@@ -76,6 +77,9 @@ static const struct v4l2_dv_timings_cap video_timings_cap = { 
	},

};



/* Dummy timings when no signal present */

static const struct v4l2_dv_timings cea1080p60 = V4L2_DV_BT_CEA_1920X1080P60;



/*

 * Returns the video output connected with the given video input if the input

 * is in loopback mode.
@@ -318,7 +322,8 @@ static int fh_open(struct file *file) 
	if (!v4l2_fh_is_singular_file(file))

		goto out;



	get_timings(vindev, &vindev->timings);

	if (get_timings(vindev, &vindev->timings) < 0)

		vindev->timings = cea1080p60;

	set_loopback_padding(vindev, vindev->padding);



out:
@@ -394,12 +399,13 @@ static int vidioc_enum_frameintervals(struct file *file, void *priv, 
	    ival->height != vindev->timings.bt.height)

		return -EINVAL;



	ival->type = V4L2_FRMIVAL_TYPE_CONTINUOUS;

	ival->stepwise.min.denominator = 60;

	ival->stepwise.min.numerator = 1;

	ival->stepwise.max.denominator = 1;

	ival->stepwise.max.numerator = 1;

	ival->stepwise.step = ival->stepwise.max;

	ival->type = V4L2_FRMIVAL_TYPE_STEPWISE;

	ival->stepwise.max.denominator = MGB4_HW_FREQ;

	ival->stepwise.max.numerator = 0xFFFFFFFF;

	ival->stepwise.min.denominator = vindev->timings.bt.pixelclock;

	ival->stepwise.min.numerator = pixel_size(&vindev->timings);

	ival->stepwise.step.denominator = MGB4_HW_FREQ;

	ival->stepwise.step.numerator = 1;



	return 0;

}
@@ -558,24 +564,56 @@ static int vidioc_g_input(struct file *file, void *priv, unsigned int *i) 
	return 0;

}



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

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

			 struct v4l2_streamparm *parm)

{

	struct mgb4_vin_dev *vindev = video_drvdata(file);

	struct mgb4_regs *video = &vindev->mgbdev->video;

	const struct mgb4_vin_regs *regs = &vindev->config->regs;

	struct v4l2_fract timeperframe = {

		.numerator = mgb4_read_reg(video, regs->frame_period),

		.denominator = 125000000,

	};

	struct v4l2_fract *tpf = &parm->parm.output.timeperframe;

	u32 timer;



	parm->parm.capture.readbuffers = 2;

	parm->parm.capture.capability = V4L2_CAP_TIMEPERFRAME;

	parm->parm.capture.timeperframe = timeperframe;



	if (has_timeperframe(video)) {

		timer = mgb4_read_reg(video, vindev->config->regs.timer);

		if (timer < 0xFFFF) {

			tpf->numerator = pixel_size(&vindev->timings);

			tpf->denominator = vindev->timings.bt.pixelclock;

		} else {

			tpf->numerator = timer;

			tpf->denominator = MGB4_HW_FREQ;

		}



		parm->parm.output.capability = V4L2_CAP_TIMEPERFRAME;

	}



	return 0;

}



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

			 struct v4l2_streamparm *parm)

{

	struct mgb4_vin_dev *vindev = video_drvdata(file);

	struct mgb4_regs *video = &vindev->mgbdev->video;

	struct v4l2_fract *tpf = &parm->parm.output.timeperframe;

	u32 period, timer;



	if (has_timeperframe(video)) {

		timer = tpf->denominator ?

			MGB4_PERIOD(tpf->numerator, tpf->denominator) : 0;

		if (timer) {

			period = MGB4_PERIOD(pixel_size(&vindev->timings),

					     vindev->timings.bt.pixelclock);

			if (timer < period)

				timer = 0;

		}



		mgb4_write_reg(video, vindev->config->regs.timer, timer);

	}



	return vidioc_g_parm(file, priv, parm);

}



static int vidioc_s_dv_timings(struct file *file, void *fh,

			       struct v4l2_dv_timings *timings)

{
@@ -659,8 +697,8 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { 
	.vidioc_expbuf = vb2_ioctl_expbuf,

	.vidioc_streamon = vb2_ioctl_streamon,

	.vidioc_streamoff = vb2_ioctl_streamoff,

	.vidioc_g_parm = vidioc_parm,

	.vidioc_s_parm = vidioc_parm,

	.vidioc_g_parm = vidioc_g_parm,

	.vidioc_s_parm = vidioc_s_parm,

	.vidioc_dv_timings_cap = vidioc_dv_timings_cap,

	.vidioc_enum_dv_timings = vidioc_enum_dv_timings,

	.vidioc_g_dv_timings = vidioc_g_dv_timings,
@@ -843,10 +881,16 @@ static void debugfs_init(struct mgb4_vin_dev *vindev) 
	vindev->regs[7].offset = vindev->config->regs.signal2;

	vindev->regs[8].name = "PADDING_PIXELS";

	vindev->regs[8].offset = vindev->config->regs.padding;

	if (has_timeperframe(video)) {

		vindev->regs[9].name = "TIMER";

		vindev->regs[9].offset = vindev->config->regs.timer;

		vindev->regset.nregs = 10;

	} else {

		vindev->regset.nregs = 9;

	}



	vindev->regset.base = video->membase;

	vindev->regset.regs = vindev->regs;

	vindev->regset.nregs = ARRAY_SIZE(vindev->regs);



	debugfs_create_regset32("registers", 0444, vindev->debugfs,

				&vindev->regset);