Commit eb8305b1 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

[media] tvp7002: add support for the new dv timings API

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent f00dc304
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/videodev2.h> #include <linux/videodev2.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/v4l2-dv-timings.h>
#include <media/tvp7002.h> #include <media/tvp7002.h>
#include <media/v4l2-device.h> #include <media/v4l2-device.h>
#include <media/v4l2-chip-ident.h> #include <media/v4l2-chip-ident.h>
...@@ -328,6 +329,7 @@ static const struct i2c_reg_value tvp7002_parms_720P50[] = { ...@@ -328,6 +329,7 @@ static const struct i2c_reg_value tvp7002_parms_720P50[] = {
/* Preset definition for handling device operation */ /* Preset definition for handling device operation */
struct tvp7002_preset_definition { struct tvp7002_preset_definition {
u32 preset; u32 preset;
struct v4l2_dv_timings timings;
const struct i2c_reg_value *p_settings; const struct i2c_reg_value *p_settings;
enum v4l2_colorspace color_space; enum v4l2_colorspace color_space;
enum v4l2_field scanmode; enum v4l2_field scanmode;
...@@ -341,6 +343,7 @@ struct tvp7002_preset_definition { ...@@ -341,6 +343,7 @@ struct tvp7002_preset_definition {
static const struct tvp7002_preset_definition tvp7002_presets[] = { static const struct tvp7002_preset_definition tvp7002_presets[] = {
{ {
V4L2_DV_720P60, V4L2_DV_720P60,
V4L2_DV_BT_CEA_1280X720P60,
tvp7002_parms_720P60, tvp7002_parms_720P60,
V4L2_COLORSPACE_REC709, V4L2_COLORSPACE_REC709,
V4L2_FIELD_NONE, V4L2_FIELD_NONE,
...@@ -351,6 +354,7 @@ static const struct tvp7002_preset_definition tvp7002_presets[] = { ...@@ -351,6 +354,7 @@ static const struct tvp7002_preset_definition tvp7002_presets[] = {
}, },
{ {
V4L2_DV_1080I60, V4L2_DV_1080I60,
V4L2_DV_BT_CEA_1920X1080I60,
tvp7002_parms_1080I60, tvp7002_parms_1080I60,
V4L2_COLORSPACE_REC709, V4L2_COLORSPACE_REC709,
V4L2_FIELD_INTERLACED, V4L2_FIELD_INTERLACED,
...@@ -361,6 +365,7 @@ static const struct tvp7002_preset_definition tvp7002_presets[] = { ...@@ -361,6 +365,7 @@ static const struct tvp7002_preset_definition tvp7002_presets[] = {
}, },
{ {
V4L2_DV_1080I50, V4L2_DV_1080I50,
V4L2_DV_BT_CEA_1920X1080I50,
tvp7002_parms_1080I50, tvp7002_parms_1080I50,
V4L2_COLORSPACE_REC709, V4L2_COLORSPACE_REC709,
V4L2_FIELD_INTERLACED, V4L2_FIELD_INTERLACED,
...@@ -371,6 +376,7 @@ static const struct tvp7002_preset_definition tvp7002_presets[] = { ...@@ -371,6 +376,7 @@ static const struct tvp7002_preset_definition tvp7002_presets[] = {
}, },
{ {
V4L2_DV_720P50, V4L2_DV_720P50,
V4L2_DV_BT_CEA_1280X720P50,
tvp7002_parms_720P50, tvp7002_parms_720P50,
V4L2_COLORSPACE_REC709, V4L2_COLORSPACE_REC709,
V4L2_FIELD_NONE, V4L2_FIELD_NONE,
...@@ -381,6 +387,7 @@ static const struct tvp7002_preset_definition tvp7002_presets[] = { ...@@ -381,6 +387,7 @@ static const struct tvp7002_preset_definition tvp7002_presets[] = {
}, },
{ {
V4L2_DV_1080P60, V4L2_DV_1080P60,
V4L2_DV_BT_CEA_1920X1080P60,
tvp7002_parms_1080P60, tvp7002_parms_1080P60,
V4L2_COLORSPACE_REC709, V4L2_COLORSPACE_REC709,
V4L2_FIELD_NONE, V4L2_FIELD_NONE,
...@@ -391,6 +398,7 @@ static const struct tvp7002_preset_definition tvp7002_presets[] = { ...@@ -391,6 +398,7 @@ static const struct tvp7002_preset_definition tvp7002_presets[] = {
}, },
{ {
V4L2_DV_480P59_94, V4L2_DV_480P59_94,
V4L2_DV_BT_CEA_720X480P59_94,
tvp7002_parms_480P, tvp7002_parms_480P,
V4L2_COLORSPACE_SMPTE170M, V4L2_COLORSPACE_SMPTE170M,
V4L2_FIELD_NONE, V4L2_FIELD_NONE,
...@@ -401,6 +409,7 @@ static const struct tvp7002_preset_definition tvp7002_presets[] = { ...@@ -401,6 +409,7 @@ static const struct tvp7002_preset_definition tvp7002_presets[] = {
}, },
{ {
V4L2_DV_576P50, V4L2_DV_576P50,
V4L2_DV_BT_CEA_720X576P50,
tvp7002_parms_576P, tvp7002_parms_576P,
V4L2_COLORSPACE_SMPTE170M, V4L2_COLORSPACE_SMPTE170M,
V4L2_FIELD_NONE, V4L2_FIELD_NONE,
...@@ -605,6 +614,35 @@ static int tvp7002_s_dv_preset(struct v4l2_subdev *sd, ...@@ -605,6 +614,35 @@ static int tvp7002_s_dv_preset(struct v4l2_subdev *sd,
return -EINVAL; return -EINVAL;
} }
static int tvp7002_s_dv_timings(struct v4l2_subdev *sd,
struct v4l2_dv_timings *dv_timings)
{
struct tvp7002 *device = to_tvp7002(sd);
const struct v4l2_bt_timings *bt = &dv_timings->bt;
int i;
if (dv_timings->type != V4L2_DV_BT_656_1120)
return -EINVAL;
for (i = 0; i < NUM_PRESETS; i++) {
const struct v4l2_bt_timings *t = &tvp7002_presets[i].timings.bt;
if (!memcmp(bt, t, &bt->standards - &bt->width)) {
device->current_preset = &tvp7002_presets[i];
return tvp7002_write_inittab(sd, tvp7002_presets[i].p_settings);
}
}
return -EINVAL;
}
static int tvp7002_g_dv_timings(struct v4l2_subdev *sd,
struct v4l2_dv_timings *dv_timings)
{
struct tvp7002 *device = to_tvp7002(sd);
*dv_timings = device->current_preset->timings;
return 0;
}
/* /*
* tvp7002_s_ctrl() - Set a control * tvp7002_s_ctrl() - Set a control
* @ctrl: ptr to v4l2_ctrl struct * @ctrl: ptr to v4l2_ctrl struct
...@@ -666,8 +704,7 @@ static int tvp7002_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *f ...@@ -666,8 +704,7 @@ static int tvp7002_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *f
* Returns the current DV preset by TVP7002. If no active input is * Returns the current DV preset by TVP7002. If no active input is
* detected, returns -EINVAL * detected, returns -EINVAL
*/ */
static int tvp7002_query_dv_preset(struct v4l2_subdev *sd, static int tvp7002_query_dv(struct v4l2_subdev *sd, int *index)
struct v4l2_dv_preset *qpreset)
{ {
const struct tvp7002_preset_definition *presets = tvp7002_presets; const struct tvp7002_preset_definition *presets = tvp7002_presets;
u8 progressive; u8 progressive;
...@@ -678,10 +715,9 @@ static int tvp7002_query_dv_preset(struct v4l2_subdev *sd, ...@@ -678,10 +715,9 @@ static int tvp7002_query_dv_preset(struct v4l2_subdev *sd,
u8 lpf_msb; u8 lpf_msb;
u8 cpl_lsb; u8 cpl_lsb;
u8 cpl_msb; u8 cpl_msb;
int index;
/* Return invalid preset if no active input is detected */ /* Return invalid index if no active input is detected */
qpreset->preset = V4L2_DV_INVALID; *index = NUM_PRESETS;
/* Read standards from device registers */ /* Read standards from device registers */
tvp7002_read_err(sd, TVP7002_L_FRAME_STAT_LSBS, &lpf_lsb, &error); tvp7002_read_err(sd, TVP7002_L_FRAME_STAT_LSBS, &lpf_lsb, &error);
...@@ -702,7 +738,7 @@ static int tvp7002_query_dv_preset(struct v4l2_subdev *sd, ...@@ -702,7 +738,7 @@ static int tvp7002_query_dv_preset(struct v4l2_subdev *sd,
progressive = (lpf_msb & TVP7002_INPR_MASK) >> TVP7002_IP_SHIFT; progressive = (lpf_msb & TVP7002_INPR_MASK) >> TVP7002_IP_SHIFT;
/* Do checking of video modes */ /* Do checking of video modes */
for (index = 0; index < NUM_PRESETS; index++, presets++) for (*index = 0; *index < NUM_PRESETS; (*index)++, presets++)
if (lpfr == presets->lines_per_frame && if (lpfr == presets->lines_per_frame &&
progressive == presets->progressive) { progressive == presets->progressive) {
if (presets->cpl_min == 0xffff) if (presets->cpl_min == 0xffff)
...@@ -711,17 +747,42 @@ static int tvp7002_query_dv_preset(struct v4l2_subdev *sd, ...@@ -711,17 +747,42 @@ static int tvp7002_query_dv_preset(struct v4l2_subdev *sd,
break; break;
} }
if (index == NUM_PRESETS) { if (*index == NUM_PRESETS) {
v4l2_dbg(1, debug, sd, "detection failed: lpf = %x, cpl = %x\n", v4l2_dbg(1, debug, sd, "detection failed: lpf = %x, cpl = %x\n",
lpfr, cpln); lpfr, cpln);
return -ENOLINK;
}
/* Update lines per frame and clocks per line info */
v4l2_dbg(1, debug, sd, "detected preset: %d\n", *index);
return 0; return 0;
}
static int tvp7002_query_dv_preset(struct v4l2_subdev *sd,
struct v4l2_dv_preset *qpreset)
{
int index;
int err = tvp7002_query_dv(sd, &index);
if (err || index == NUM_PRESETS) {
qpreset->preset = V4L2_DV_INVALID;
if (err == -ENOLINK)
err = 0;
return err;
} }
qpreset->preset = tvp7002_presets[index].preset;
return 0;
}
/* Set values in found preset */ static int tvp7002_query_dv_timings(struct v4l2_subdev *sd,
qpreset->preset = presets->preset; struct v4l2_dv_timings *timings)
{
int index;
int err = tvp7002_query_dv(sd, &index);
/* Update lines per frame and clocks per line info */ if (err)
v4l2_dbg(1, debug, sd, "detected preset: %d\n", presets->preset); return err;
*timings = tvp7002_presets[index].timings;
return 0; return 0;
} }
...@@ -891,6 +952,17 @@ static int tvp7002_enum_dv_presets(struct v4l2_subdev *sd, ...@@ -891,6 +952,17 @@ static int tvp7002_enum_dv_presets(struct v4l2_subdev *sd,
return v4l_fill_dv_preset_info(tvp7002_presets[preset->index].preset, preset); return v4l_fill_dv_preset_info(tvp7002_presets[preset->index].preset, preset);
} }
static int tvp7002_enum_dv_timings(struct v4l2_subdev *sd,
struct v4l2_enum_dv_timings *timings)
{
/* Check requested format index is within range */
if (timings->index >= NUM_PRESETS)
return -EINVAL;
timings->timings = tvp7002_presets[timings->index].timings;
return 0;
}
static const struct v4l2_ctrl_ops tvp7002_ctrl_ops = { static const struct v4l2_ctrl_ops tvp7002_ctrl_ops = {
.s_ctrl = tvp7002_s_ctrl, .s_ctrl = tvp7002_s_ctrl,
}; };
...@@ -917,6 +989,10 @@ static const struct v4l2_subdev_video_ops tvp7002_video_ops = { ...@@ -917,6 +989,10 @@ static const struct v4l2_subdev_video_ops tvp7002_video_ops = {
.enum_dv_presets = tvp7002_enum_dv_presets, .enum_dv_presets = tvp7002_enum_dv_presets,
.s_dv_preset = tvp7002_s_dv_preset, .s_dv_preset = tvp7002_s_dv_preset,
.query_dv_preset = tvp7002_query_dv_preset, .query_dv_preset = tvp7002_query_dv_preset,
.g_dv_timings = tvp7002_g_dv_timings,
.s_dv_timings = tvp7002_s_dv_timings,
.enum_dv_timings = tvp7002_enum_dv_timings,
.query_dv_timings = tvp7002_query_dv_timings,
.s_stream = tvp7002_s_stream, .s_stream = tvp7002_s_stream,
.g_mbus_fmt = tvp7002_mbus_fmt, .g_mbus_fmt = tvp7002_mbus_fmt,
.try_mbus_fmt = tvp7002_mbus_fmt, .try_mbus_fmt = tvp7002_mbus_fmt,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment