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

[media] v4l2-dv-timings: add callback to handle exceptions

In most cases the v4l2_bt_timings_cap struct has all the information
necessary to determine valid timings, but occasionally there are exceptions.
Add a callback function to be able to test for those exceptions.
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 70b65494
...@@ -648,12 +648,12 @@ static int ad9389b_s_dv_timings(struct v4l2_subdev *sd, ...@@ -648,12 +648,12 @@ static int ad9389b_s_dv_timings(struct v4l2_subdev *sd,
v4l2_dbg(1, debug, sd, "%s:\n", __func__); v4l2_dbg(1, debug, sd, "%s:\n", __func__);
/* quick sanity check */ /* quick sanity check */
if (!v4l2_valid_dv_timings(timings, &ad9389b_timings_cap)) if (!v4l2_valid_dv_timings(timings, &ad9389b_timings_cap, NULL, NULL))
return -EINVAL; return -EINVAL;
/* Fill the optional fields .standards and .flags in struct v4l2_dv_timings /* Fill the optional fields .standards and .flags in struct v4l2_dv_timings
if the format is one of the CEA or DMT timings. */ if the format is one of the CEA or DMT timings. */
v4l2_find_dv_timings_cap(timings, &ad9389b_timings_cap, 0); v4l2_find_dv_timings_cap(timings, &ad9389b_timings_cap, 0, NULL, NULL);
timings->bt.flags &= ~V4L2_DV_FL_REDUCED_FPS; timings->bt.flags &= ~V4L2_DV_FL_REDUCED_FPS;
...@@ -691,7 +691,8 @@ static int ad9389b_g_dv_timings(struct v4l2_subdev *sd, ...@@ -691,7 +691,8 @@ static int ad9389b_g_dv_timings(struct v4l2_subdev *sd,
static int ad9389b_enum_dv_timings(struct v4l2_subdev *sd, static int ad9389b_enum_dv_timings(struct v4l2_subdev *sd,
struct v4l2_enum_dv_timings *timings) struct v4l2_enum_dv_timings *timings)
{ {
return v4l2_enum_dv_timings_cap(timings, &ad9389b_timings_cap); return v4l2_enum_dv_timings_cap(timings, &ad9389b_timings_cap,
NULL, NULL);
} }
static int ad9389b_dv_timings_cap(struct v4l2_subdev *sd, static int ad9389b_dv_timings_cap(struct v4l2_subdev *sd,
......
...@@ -378,10 +378,12 @@ static int ths8200_s_dv_timings(struct v4l2_subdev *sd, ...@@ -378,10 +378,12 @@ static int ths8200_s_dv_timings(struct v4l2_subdev *sd,
v4l2_dbg(1, debug, sd, "%s:\n", __func__); v4l2_dbg(1, debug, sd, "%s:\n", __func__);
if (!v4l2_valid_dv_timings(timings, &ths8200_timings_cap)) if (!v4l2_valid_dv_timings(timings, &ths8200_timings_cap,
NULL, NULL))
return -EINVAL; return -EINVAL;
if (!v4l2_find_dv_timings_cap(timings, &ths8200_timings_cap, 10)) { if (!v4l2_find_dv_timings_cap(timings, &ths8200_timings_cap, 10,
NULL, NULL)) {
v4l2_dbg(1, debug, sd, "Unsupported format\n"); v4l2_dbg(1, debug, sd, "Unsupported format\n");
return -EINVAL; return -EINVAL;
} }
...@@ -411,7 +413,8 @@ static int ths8200_g_dv_timings(struct v4l2_subdev *sd, ...@@ -411,7 +413,8 @@ static int ths8200_g_dv_timings(struct v4l2_subdev *sd,
static int ths8200_enum_dv_timings(struct v4l2_subdev *sd, static int ths8200_enum_dv_timings(struct v4l2_subdev *sd,
struct v4l2_enum_dv_timings *timings) struct v4l2_enum_dv_timings *timings)
{ {
return v4l2_enum_dv_timings_cap(timings, &ths8200_timings_cap); return v4l2_enum_dv_timings_cap(timings, &ths8200_timings_cap,
NULL, NULL);
} }
static int ths8200_dv_timings_cap(struct v4l2_subdev *sd, static int ths8200_dv_timings_cap(struct v4l2_subdev *sd,
......
...@@ -132,7 +132,9 @@ const struct v4l2_dv_timings v4l2_dv_timings_presets[] = { ...@@ -132,7 +132,9 @@ const struct v4l2_dv_timings v4l2_dv_timings_presets[] = {
EXPORT_SYMBOL_GPL(v4l2_dv_timings_presets); EXPORT_SYMBOL_GPL(v4l2_dv_timings_presets);
bool v4l2_valid_dv_timings(const struct v4l2_dv_timings *t, bool v4l2_valid_dv_timings(const struct v4l2_dv_timings *t,
const struct v4l2_dv_timings_cap *dvcap) const struct v4l2_dv_timings_cap *dvcap,
v4l2_check_dv_timings_fnc fnc,
void *fnc_handle)
{ {
const struct v4l2_bt_timings *bt = &t->bt; const struct v4l2_bt_timings *bt = &t->bt;
const struct v4l2_bt_timings_cap *cap = &dvcap->bt; const struct v4l2_bt_timings_cap *cap = &dvcap->bt;
...@@ -151,18 +153,21 @@ bool v4l2_valid_dv_timings(const struct v4l2_dv_timings *t, ...@@ -151,18 +153,21 @@ bool v4l2_valid_dv_timings(const struct v4l2_dv_timings *t,
(bt->interlaced && !(caps & V4L2_DV_BT_CAP_INTERLACED)) || (bt->interlaced && !(caps & V4L2_DV_BT_CAP_INTERLACED)) ||
(!bt->interlaced && !(caps & V4L2_DV_BT_CAP_PROGRESSIVE))) (!bt->interlaced && !(caps & V4L2_DV_BT_CAP_PROGRESSIVE)))
return false; return false;
return true; return fnc == NULL || fnc(t, fnc_handle);
} }
EXPORT_SYMBOL_GPL(v4l2_valid_dv_timings); EXPORT_SYMBOL_GPL(v4l2_valid_dv_timings);
int v4l2_enum_dv_timings_cap(struct v4l2_enum_dv_timings *t, int v4l2_enum_dv_timings_cap(struct v4l2_enum_dv_timings *t,
const struct v4l2_dv_timings_cap *cap) const struct v4l2_dv_timings_cap *cap,
v4l2_check_dv_timings_fnc fnc,
void *fnc_handle)
{ {
u32 i, idx; u32 i, idx;
memset(t->reserved, 0, sizeof(t->reserved)); memset(t->reserved, 0, sizeof(t->reserved));
for (i = idx = 0; v4l2_dv_timings_presets[i].bt.width; i++) { for (i = idx = 0; v4l2_dv_timings_presets[i].bt.width; i++) {
if (v4l2_valid_dv_timings(v4l2_dv_timings_presets + i, cap) && if (v4l2_valid_dv_timings(v4l2_dv_timings_presets + i, cap,
fnc, fnc_handle) &&
idx++ == t->index) { idx++ == t->index) {
t->timings = v4l2_dv_timings_presets[i]; t->timings = v4l2_dv_timings_presets[i];
return 0; return 0;
...@@ -174,16 +179,20 @@ EXPORT_SYMBOL_GPL(v4l2_enum_dv_timings_cap); ...@@ -174,16 +179,20 @@ EXPORT_SYMBOL_GPL(v4l2_enum_dv_timings_cap);
bool v4l2_find_dv_timings_cap(struct v4l2_dv_timings *t, bool v4l2_find_dv_timings_cap(struct v4l2_dv_timings *t,
const struct v4l2_dv_timings_cap *cap, const struct v4l2_dv_timings_cap *cap,
unsigned pclock_delta) unsigned pclock_delta,
v4l2_check_dv_timings_fnc fnc,
void *fnc_handle)
{ {
int i; int i;
if (!v4l2_valid_dv_timings(t, cap)) if (!v4l2_valid_dv_timings(t, cap, fnc, fnc_handle))
return false; return false;
for (i = 0; i < v4l2_dv_timings_presets[i].bt.width; i++) { for (i = 0; i < v4l2_dv_timings_presets[i].bt.width; i++) {
if (v4l2_valid_dv_timings(v4l2_dv_timings_presets + i, cap) && if (v4l2_valid_dv_timings(v4l2_dv_timings_presets + i, cap,
v4l2_match_dv_timings(t, v4l2_dv_timings_presets + i, pclock_delta)) { fnc, fnc_handle) &&
v4l2_match_dv_timings(t, v4l2_dv_timings_presets + i,
pclock_delta)) {
*t = v4l2_dv_timings_presets[i]; *t = v4l2_dv_timings_presets[i];
return true; return true;
} }
......
...@@ -27,46 +27,68 @@ ...@@ -27,46 +27,68 @@
*/ */
extern const struct v4l2_dv_timings v4l2_dv_timings_presets[]; extern const struct v4l2_dv_timings v4l2_dv_timings_presets[];
/** v4l2_check_dv_timings_fnc - timings check callback
* @t: the v4l2_dv_timings struct.
* @handle: a handle from the driver.
*
* Returns true if the given timings are valid.
*/
typedef bool v4l2_check_dv_timings_fnc(const struct v4l2_dv_timings *t, void *handle);
/** v4l2_valid_dv_timings() - are these timings valid? /** v4l2_valid_dv_timings() - are these timings valid?
* @t: the v4l2_dv_timings struct. * @t: the v4l2_dv_timings struct.
* @cap: the v4l2_dv_timings_cap capabilities. * @cap: the v4l2_dv_timings_cap capabilities.
* @fnc: callback to check if this timing is OK. May be NULL.
* @fnc_handle: a handle that is passed on to @fnc.
* *
* Returns true if the given dv_timings struct is supported by the * Returns true if the given dv_timings struct is supported by the
* hardware capabilities, returns false otherwise. * hardware capabilities and the callback function (if non-NULL), returns
* false otherwise.
*/ */
bool v4l2_valid_dv_timings(const struct v4l2_dv_timings *t, bool v4l2_valid_dv_timings(const struct v4l2_dv_timings *t,
const struct v4l2_dv_timings_cap *cap); const struct v4l2_dv_timings_cap *cap,
v4l2_check_dv_timings_fnc fnc,
void *fnc_handle);
/** v4l2_enum_dv_timings_cap() - Helper function to enumerate possible DV timings based on capabilities /** v4l2_enum_dv_timings_cap() - Helper function to enumerate possible DV timings based on capabilities
* @t: the v4l2_enum_dv_timings struct. * @t: the v4l2_enum_dv_timings struct.
* @cap: the v4l2_dv_timings_cap capabilities. * @cap: the v4l2_dv_timings_cap capabilities.
* @fnc: callback to check if this timing is OK. May be NULL.
* @fnc_handle: a handle that is passed on to @fnc.
* *
* This enumerates dv_timings using the full list of possible CEA-861 and DMT * This enumerates dv_timings using the full list of possible CEA-861 and DMT
* timings, filtering out any timings that are not supported based on the * timings, filtering out any timings that are not supported based on the
* hardware capabilities. * hardware capabilities and the callback function (if non-NULL).
* *
* If a valid timing for the given index is found, it will fill in @t and * If a valid timing for the given index is found, it will fill in @t and
* return 0, otherwise it returns -EINVAL. * return 0, otherwise it returns -EINVAL.
*/ */
int v4l2_enum_dv_timings_cap(struct v4l2_enum_dv_timings *t, int v4l2_enum_dv_timings_cap(struct v4l2_enum_dv_timings *t,
const struct v4l2_dv_timings_cap *cap); const struct v4l2_dv_timings_cap *cap,
v4l2_check_dv_timings_fnc fnc,
void *fnc_handle);
/** v4l2_find_dv_timings_cap() - Find the closest timings struct /** v4l2_find_dv_timings_cap() - Find the closest timings struct
* @t: the v4l2_enum_dv_timings struct. * @t: the v4l2_enum_dv_timings struct.
* @cap: the v4l2_dv_timings_cap capabilities. * @cap: the v4l2_dv_timings_cap capabilities.
* @pclock_delta: maximum delta between t->pixelclock and the timing struct * @pclock_delta: maximum delta between t->pixelclock and the timing struct
* under consideration. * under consideration.
* @fnc: callback to check if a given timings struct is OK. May be NULL.
* @fnc_handle: a handle that is passed on to @fnc.
* *
* This function tries to map the given timings to an entry in the * This function tries to map the given timings to an entry in the
* full list of possible CEA-861 and DMT timings, filtering out any timings * full list of possible CEA-861 and DMT timings, filtering out any timings
* that are not supported based on the hardware capabilities. * that are not supported based on the hardware capabilities and the callback
* function (if non-NULL).
* *
* On success it will fill in @t with the found timings and it returns true. * On success it will fill in @t with the found timings and it returns true.
* On failure it will return false. * On failure it will return false.
*/ */
bool v4l2_find_dv_timings_cap(struct v4l2_dv_timings *t, bool v4l2_find_dv_timings_cap(struct v4l2_dv_timings *t,
const struct v4l2_dv_timings_cap *cap, const struct v4l2_dv_timings_cap *cap,
unsigned pclock_delta); unsigned pclock_delta,
v4l2_check_dv_timings_fnc fnc,
void *fnc_handle);
/** v4l2_match_dv_timings() - do two timings match? /** v4l2_match_dv_timings() - do two timings match?
* @measured: the measured timings data. * @measured: the measured timings data.
......
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