| Message ID | 1453817024-12853-1-git-send-email-jean-michel.hautbois@veo-labs.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 01/26/16 15:03, Jean-Michel Hautbois wrote: > Use the helper to enumerate and set DV timings instead of a custom code. > This will ease debugging too, as it is consistent with other drivers. I tested this with my adv7604, comparing the before and after list of enumerated formats. I noticed however that you forgot to remove the adv76xx_timings array. Since this is now obsolete it should be removed. In fact, in the enum_dv_timings function you incorrectly use it to check for the largest index: that check should be removed! So this needs a v3, sorry. Regards, Hans > Signed-off-by: Jean-Michel Hautbois <jean-michel.hautbois@veo-labs.com> > --- > v2: add an exception for V4L2_DV_BT_CEA_1280X720P30 timing > > drivers/media/i2c/adv7604.c | 114 ++++++++++++++++++++++++++------------------ > 1 file changed, 67 insertions(+), 47 deletions(-) > > diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c > index f8dd750..9c0d462 100644 > --- a/drivers/media/i2c/adv7604.c > +++ b/drivers/media/i2c/adv7604.c > @@ -207,6 +207,22 @@ static bool adv76xx_has_afe(struct adv76xx_state *state) > return state->info->has_afe; > } > > +/* Unsupported timings. This device cannot support 720p30. */ > +static const struct v4l2_dv_timings adv76xx_timings_exceptions[] = { > + V4L2_DV_BT_CEA_1280X720P30, > + { } > +}; > + > +static bool adv76xx_check_dv_timings(const struct v4l2_dv_timings *t, void *hdl) > +{ > + int i; > + > + for (i = 0; adv76xx_timings_exceptions[i].bt.width; i++) > + if (v4l2_match_dv_timings(t, adv76xx_timings_exceptions + i, 0, false)) > + return false; > + return true; > +} > + > /* Supported CEA and DMT timings */ > static const struct v4l2_dv_timings adv76xx_timings[] = { > V4L2_DV_BT_CEA_720X480P59_94, > @@ -806,6 +822,36 @@ static inline bool is_digital_input(struct v4l2_subdev *sd) > state->selected_input == ADV7604_PAD_HDMI_PORT_D; > } > > +static const struct v4l2_dv_timings_cap adv7604_timings_cap_analog = { > + .type = V4L2_DV_BT_656_1120, > + /* keep this initialization for compatibility with GCC < 4.4.6 */ > + .reserved = { 0 }, > + V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000, > + V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | > + V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, > + V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING | > + V4L2_DV_BT_CAP_CUSTOM) > +}; > + > +static const struct v4l2_dv_timings_cap adv76xx_timings_cap_digital = { > + .type = V4L2_DV_BT_656_1120, > + /* keep this initialization for compatibility with GCC < 4.4.6 */ > + .reserved = { 0 }, > + V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 225000000, > + V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | > + V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, > + V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING | > + V4L2_DV_BT_CAP_CUSTOM) > +}; > + > +static inline const struct v4l2_dv_timings_cap * > +adv76xx_get_dv_timings_cap(struct v4l2_subdev *sd) > +{ > + return is_digital_input(sd) ? &adv76xx_timings_cap_digital : > + &adv7604_timings_cap_analog; > +} > + > + > /* ----------------------------------------------------------------------- */ > > #ifdef CONFIG_VIDEO_ADV_DEBUG > @@ -1330,17 +1376,23 @@ static int stdi2dv_timings(struct v4l2_subdev *sd, > u32 pix_clk; > int i; > > - for (i = 0; adv76xx_timings[i].bt.height; i++) { > - if (vtotal(&adv76xx_timings[i].bt) != stdi->lcf + 1) > + for (i = 0; v4l2_dv_timings_presets[i].bt.width; i++) { > + const struct v4l2_bt_timings *bt = &v4l2_dv_timings_presets[i].bt; > + > + if (!v4l2_valid_dv_timings(&v4l2_dv_timings_presets[i], > + adv76xx_get_dv_timings_cap(sd), > + adv76xx_check_dv_timings, NULL)) > + continue; > + if (vtotal(bt) != stdi->lcf + 1) > continue; > - if (adv76xx_timings[i].bt.vsync != stdi->lcvs) > + if (bt->vsync != stdi->lcvs) > continue; > > - pix_clk = hfreq * htotal(&adv76xx_timings[i].bt); > + pix_clk = hfreq * htotal(bt); > > - if ((pix_clk < adv76xx_timings[i].bt.pixelclock + 1000000) && > - (pix_clk > adv76xx_timings[i].bt.pixelclock - 1000000)) { > - *timings = adv76xx_timings[i]; > + if ((pix_clk < bt->pixelclock + 1000000) && > + (pix_clk > bt->pixelclock - 1000000)) { > + *timings = v4l2_dv_timings_presets[i]; > return 0; > } > } > @@ -1431,9 +1483,8 @@ static int adv76xx_enum_dv_timings(struct v4l2_subdev *sd, > if (timings->pad >= state->source_pad) > return -EINVAL; > > - memset(timings->reserved, 0, sizeof(timings->reserved)); > - timings->timings = adv76xx_timings[timings->index]; > - return 0; > + return v4l2_enum_dv_timings_cap(timings, > + adv76xx_get_dv_timings_cap(sd), adv76xx_check_dv_timings, NULL); > } > > static int adv76xx_dv_timings_cap(struct v4l2_subdev *sd, > @@ -1444,29 +1495,7 @@ static int adv76xx_dv_timings_cap(struct v4l2_subdev *sd, > if (cap->pad >= state->source_pad) > return -EINVAL; > > - cap->type = V4L2_DV_BT_656_1120; > - cap->bt.max_width = 1920; > - cap->bt.max_height = 1200; > - cap->bt.min_pixelclock = 25000000; > - > - switch (cap->pad) { > - case ADV76XX_PAD_HDMI_PORT_A: > - case ADV7604_PAD_HDMI_PORT_B: > - case ADV7604_PAD_HDMI_PORT_C: > - case ADV7604_PAD_HDMI_PORT_D: > - cap->bt.max_pixelclock = 225000000; > - break; > - case ADV7604_PAD_VGA_RGB: > - case ADV7604_PAD_VGA_COMP: > - default: > - cap->bt.max_pixelclock = 170000000; > - break; > - } > - > - cap->bt.standards = V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | > - V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT; > - cap->bt.capabilities = V4L2_DV_BT_CAP_PROGRESSIVE | > - V4L2_DV_BT_CAP_REDUCED_BLANKING | V4L2_DV_BT_CAP_CUSTOM; > + *cap = *adv76xx_get_dv_timings_cap(sd); > return 0; > } > > @@ -1475,15 +1504,9 @@ static int adv76xx_dv_timings_cap(struct v4l2_subdev *sd, > static void adv76xx_fill_optional_dv_timings_fields(struct v4l2_subdev *sd, > struct v4l2_dv_timings *timings) > { > - int i; > - > - for (i = 0; adv76xx_timings[i].bt.width; i++) { > - if (v4l2_match_dv_timings(timings, &adv76xx_timings[i], > - is_digital_input(sd) ? 250000 : 1000000, false)) { > - *timings = adv76xx_timings[i]; > - break; > - } > - } > + v4l2_find_dv_timings_cap(timings, adv76xx_get_dv_timings_cap(sd), > + is_digital_input(sd) ? 250000 : 1000000, > + adv76xx_check_dv_timings, NULL); > } > > static unsigned int adv7604_read_hdmi_pixelclock(struct v4l2_subdev *sd) > @@ -1651,12 +1674,9 @@ static int adv76xx_s_dv_timings(struct v4l2_subdev *sd, > > bt = &timings->bt; > > - if ((is_analog_input(sd) && bt->pixelclock > 170000000) || > - (is_digital_input(sd) && bt->pixelclock > 225000000)) { > - v4l2_dbg(1, debug, sd, "%s: pixelclock out of range %d\n", > - __func__, (u32)bt->pixelclock); > + if (!v4l2_valid_dv_timings(timings, adv76xx_get_dv_timings_cap(sd), > + adv76xx_check_dv_timings, NULL)) > return -ERANGE; > - } > > adv76xx_fill_optional_dv_timings_fields(sd, timings); > > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Hans, 2016-01-27 10:23 GMT+01:00 Hans Verkuil <hverkuil@xs4all.nl>: > On 01/26/16 15:03, Jean-Michel Hautbois wrote: >> Use the helper to enumerate and set DV timings instead of a custom code. >> This will ease debugging too, as it is consistent with other drivers. > > I tested this with my adv7604, comparing the before and after list of > enumerated formats. > > I noticed however that you forgot to remove the adv76xx_timings array. > Since this is now obsolete it should be removed. In fact, in the > enum_dv_timings function you incorrectly use it to check for the > largest index: that check should be removed! Argh ! You are right ! > So this needs a v3, sorry. No problem, will do it ASAP ! JM > Regards, > > Hans > >> Signed-off-by: Jean-Michel Hautbois <jean-michel.hautbois@veo-labs.com> >> --- >> v2: add an exception for V4L2_DV_BT_CEA_1280X720P30 timing >> >> drivers/media/i2c/adv7604.c | 114 ++++++++++++++++++++++++++------------------ >> 1 file changed, 67 insertions(+), 47 deletions(-) >> >> diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c >> index f8dd750..9c0d462 100644 >> --- a/drivers/media/i2c/adv7604.c >> +++ b/drivers/media/i2c/adv7604.c >> @@ -207,6 +207,22 @@ static bool adv76xx_has_afe(struct adv76xx_state *state) >> return state->info->has_afe; >> } >> >> +/* Unsupported timings. This device cannot support 720p30. */ >> +static const struct v4l2_dv_timings adv76xx_timings_exceptions[] = { >> + V4L2_DV_BT_CEA_1280X720P30, >> + { } >> +}; >> + >> +static bool adv76xx_check_dv_timings(const struct v4l2_dv_timings *t, void *hdl) >> +{ >> + int i; >> + >> + for (i = 0; adv76xx_timings_exceptions[i].bt.width; i++) >> + if (v4l2_match_dv_timings(t, adv76xx_timings_exceptions + i, 0, false)) >> + return false; >> + return true; >> +} >> + >> /* Supported CEA and DMT timings */ >> static const struct v4l2_dv_timings adv76xx_timings[] = { >> V4L2_DV_BT_CEA_720X480P59_94, >> @@ -806,6 +822,36 @@ static inline bool is_digital_input(struct v4l2_subdev *sd) >> state->selected_input == ADV7604_PAD_HDMI_PORT_D; >> } >> >> +static const struct v4l2_dv_timings_cap adv7604_timings_cap_analog = { >> + .type = V4L2_DV_BT_656_1120, >> + /* keep this initialization for compatibility with GCC < 4.4.6 */ >> + .reserved = { 0 }, >> + V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000, >> + V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | >> + V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, >> + V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING | >> + V4L2_DV_BT_CAP_CUSTOM) >> +}; >> + >> +static const struct v4l2_dv_timings_cap adv76xx_timings_cap_digital = { >> + .type = V4L2_DV_BT_656_1120, >> + /* keep this initialization for compatibility with GCC < 4.4.6 */ >> + .reserved = { 0 }, >> + V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 225000000, >> + V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | >> + V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, >> + V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING | >> + V4L2_DV_BT_CAP_CUSTOM) >> +}; >> + >> +static inline const struct v4l2_dv_timings_cap * >> +adv76xx_get_dv_timings_cap(struct v4l2_subdev *sd) >> +{ >> + return is_digital_input(sd) ? &adv76xx_timings_cap_digital : >> + &adv7604_timings_cap_analog; >> +} >> + >> + >> /* ----------------------------------------------------------------------- */ >> >> #ifdef CONFIG_VIDEO_ADV_DEBUG >> @@ -1330,17 +1376,23 @@ static int stdi2dv_timings(struct v4l2_subdev *sd, >> u32 pix_clk; >> int i; >> >> - for (i = 0; adv76xx_timings[i].bt.height; i++) { >> - if (vtotal(&adv76xx_timings[i].bt) != stdi->lcf + 1) >> + for (i = 0; v4l2_dv_timings_presets[i].bt.width; i++) { >> + const struct v4l2_bt_timings *bt = &v4l2_dv_timings_presets[i].bt; >> + >> + if (!v4l2_valid_dv_timings(&v4l2_dv_timings_presets[i], >> + adv76xx_get_dv_timings_cap(sd), >> + adv76xx_check_dv_timings, NULL)) >> + continue; >> + if (vtotal(bt) != stdi->lcf + 1) >> continue; >> - if (adv76xx_timings[i].bt.vsync != stdi->lcvs) >> + if (bt->vsync != stdi->lcvs) >> continue; >> >> - pix_clk = hfreq * htotal(&adv76xx_timings[i].bt); >> + pix_clk = hfreq * htotal(bt); >> >> - if ((pix_clk < adv76xx_timings[i].bt.pixelclock + 1000000) && >> - (pix_clk > adv76xx_timings[i].bt.pixelclock - 1000000)) { >> - *timings = adv76xx_timings[i]; >> + if ((pix_clk < bt->pixelclock + 1000000) && >> + (pix_clk > bt->pixelclock - 1000000)) { >> + *timings = v4l2_dv_timings_presets[i]; >> return 0; >> } >> } >> @@ -1431,9 +1483,8 @@ static int adv76xx_enum_dv_timings(struct v4l2_subdev *sd, >> if (timings->pad >= state->source_pad) >> return -EINVAL; >> >> - memset(timings->reserved, 0, sizeof(timings->reserved)); >> - timings->timings = adv76xx_timings[timings->index]; >> - return 0; >> + return v4l2_enum_dv_timings_cap(timings, >> + adv76xx_get_dv_timings_cap(sd), adv76xx_check_dv_timings, NULL); >> } >> >> static int adv76xx_dv_timings_cap(struct v4l2_subdev *sd, >> @@ -1444,29 +1495,7 @@ static int adv76xx_dv_timings_cap(struct v4l2_subdev *sd, >> if (cap->pad >= state->source_pad) >> return -EINVAL; >> >> - cap->type = V4L2_DV_BT_656_1120; >> - cap->bt.max_width = 1920; >> - cap->bt.max_height = 1200; >> - cap->bt.min_pixelclock = 25000000; >> - >> - switch (cap->pad) { >> - case ADV76XX_PAD_HDMI_PORT_A: >> - case ADV7604_PAD_HDMI_PORT_B: >> - case ADV7604_PAD_HDMI_PORT_C: >> - case ADV7604_PAD_HDMI_PORT_D: >> - cap->bt.max_pixelclock = 225000000; >> - break; >> - case ADV7604_PAD_VGA_RGB: >> - case ADV7604_PAD_VGA_COMP: >> - default: >> - cap->bt.max_pixelclock = 170000000; >> - break; >> - } >> - >> - cap->bt.standards = V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | >> - V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT; >> - cap->bt.capabilities = V4L2_DV_BT_CAP_PROGRESSIVE | >> - V4L2_DV_BT_CAP_REDUCED_BLANKING | V4L2_DV_BT_CAP_CUSTOM; >> + *cap = *adv76xx_get_dv_timings_cap(sd); >> return 0; >> } >> >> @@ -1475,15 +1504,9 @@ static int adv76xx_dv_timings_cap(struct v4l2_subdev *sd, >> static void adv76xx_fill_optional_dv_timings_fields(struct v4l2_subdev *sd, >> struct v4l2_dv_timings *timings) >> { >> - int i; >> - >> - for (i = 0; adv76xx_timings[i].bt.width; i++) { >> - if (v4l2_match_dv_timings(timings, &adv76xx_timings[i], >> - is_digital_input(sd) ? 250000 : 1000000, false)) { >> - *timings = adv76xx_timings[i]; >> - break; >> - } >> - } >> + v4l2_find_dv_timings_cap(timings, adv76xx_get_dv_timings_cap(sd), >> + is_digital_input(sd) ? 250000 : 1000000, >> + adv76xx_check_dv_timings, NULL); >> } >> >> static unsigned int adv7604_read_hdmi_pixelclock(struct v4l2_subdev *sd) >> @@ -1651,12 +1674,9 @@ static int adv76xx_s_dv_timings(struct v4l2_subdev *sd, >> >> bt = &timings->bt; >> >> - if ((is_analog_input(sd) && bt->pixelclock > 170000000) || >> - (is_digital_input(sd) && bt->pixelclock > 225000000)) { >> - v4l2_dbg(1, debug, sd, "%s: pixelclock out of range %d\n", >> - __func__, (u32)bt->pixelclock); >> + if (!v4l2_valid_dv_timings(timings, adv76xx_get_dv_timings_cap(sd), >> + adv76xx_check_dv_timings, NULL)) >> return -ERANGE; >> - } >> >> adv76xx_fill_optional_dv_timings_fields(sd, timings); >> >> -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c index f8dd750..9c0d462 100644 --- a/drivers/media/i2c/adv7604.c +++ b/drivers/media/i2c/adv7604.c @@ -207,6 +207,22 @@ static bool adv76xx_has_afe(struct adv76xx_state *state) return state->info->has_afe; } +/* Unsupported timings. This device cannot support 720p30. */ +static const struct v4l2_dv_timings adv76xx_timings_exceptions[] = { + V4L2_DV_BT_CEA_1280X720P30, + { } +}; + +static bool adv76xx_check_dv_timings(const struct v4l2_dv_timings *t, void *hdl) +{ + int i; + + for (i = 0; adv76xx_timings_exceptions[i].bt.width; i++) + if (v4l2_match_dv_timings(t, adv76xx_timings_exceptions + i, 0, false)) + return false; + return true; +} + /* Supported CEA and DMT timings */ static const struct v4l2_dv_timings adv76xx_timings[] = { V4L2_DV_BT_CEA_720X480P59_94, @@ -806,6 +822,36 @@ static inline bool is_digital_input(struct v4l2_subdev *sd) state->selected_input == ADV7604_PAD_HDMI_PORT_D; } +static const struct v4l2_dv_timings_cap adv7604_timings_cap_analog = { + .type = V4L2_DV_BT_656_1120, + /* keep this initialization for compatibility with GCC < 4.4.6 */ + .reserved = { 0 }, + V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000, + V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | + V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, + V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING | + V4L2_DV_BT_CAP_CUSTOM) +}; + +static const struct v4l2_dv_timings_cap adv76xx_timings_cap_digital = { + .type = V4L2_DV_BT_656_1120, + /* keep this initialization for compatibility with GCC < 4.4.6 */ + .reserved = { 0 }, + V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 225000000, + V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | + V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, + V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING | + V4L2_DV_BT_CAP_CUSTOM) +}; + +static inline const struct v4l2_dv_timings_cap * +adv76xx_get_dv_timings_cap(struct v4l2_subdev *sd) +{ + return is_digital_input(sd) ? &adv76xx_timings_cap_digital : + &adv7604_timings_cap_analog; +} + + /* ----------------------------------------------------------------------- */ #ifdef CONFIG_VIDEO_ADV_DEBUG @@ -1330,17 +1376,23 @@ static int stdi2dv_timings(struct v4l2_subdev *sd, u32 pix_clk; int i; - for (i = 0; adv76xx_timings[i].bt.height; i++) { - if (vtotal(&adv76xx_timings[i].bt) != stdi->lcf + 1) + for (i = 0; v4l2_dv_timings_presets[i].bt.width; i++) { + const struct v4l2_bt_timings *bt = &v4l2_dv_timings_presets[i].bt; + + if (!v4l2_valid_dv_timings(&v4l2_dv_timings_presets[i], + adv76xx_get_dv_timings_cap(sd), + adv76xx_check_dv_timings, NULL)) + continue; + if (vtotal(bt) != stdi->lcf + 1) continue; - if (adv76xx_timings[i].bt.vsync != stdi->lcvs) + if (bt->vsync != stdi->lcvs) continue; - pix_clk = hfreq * htotal(&adv76xx_timings[i].bt); + pix_clk = hfreq * htotal(bt); - if ((pix_clk < adv76xx_timings[i].bt.pixelclock + 1000000) && - (pix_clk > adv76xx_timings[i].bt.pixelclock - 1000000)) { - *timings = adv76xx_timings[i]; + if ((pix_clk < bt->pixelclock + 1000000) && + (pix_clk > bt->pixelclock - 1000000)) { + *timings = v4l2_dv_timings_presets[i]; return 0; } } @@ -1431,9 +1483,8 @@ static int adv76xx_enum_dv_timings(struct v4l2_subdev *sd, if (timings->pad >= state->source_pad) return -EINVAL; - memset(timings->reserved, 0, sizeof(timings->reserved)); - timings->timings = adv76xx_timings[timings->index]; - return 0; + return v4l2_enum_dv_timings_cap(timings, + adv76xx_get_dv_timings_cap(sd), adv76xx_check_dv_timings, NULL); } static int adv76xx_dv_timings_cap(struct v4l2_subdev *sd, @@ -1444,29 +1495,7 @@ static int adv76xx_dv_timings_cap(struct v4l2_subdev *sd, if (cap->pad >= state->source_pad) return -EINVAL; - cap->type = V4L2_DV_BT_656_1120; - cap->bt.max_width = 1920; - cap->bt.max_height = 1200; - cap->bt.min_pixelclock = 25000000; - - switch (cap->pad) { - case ADV76XX_PAD_HDMI_PORT_A: - case ADV7604_PAD_HDMI_PORT_B: - case ADV7604_PAD_HDMI_PORT_C: - case ADV7604_PAD_HDMI_PORT_D: - cap->bt.max_pixelclock = 225000000; - break; - case ADV7604_PAD_VGA_RGB: - case ADV7604_PAD_VGA_COMP: - default: - cap->bt.max_pixelclock = 170000000; - break; - } - - cap->bt.standards = V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | - V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT; - cap->bt.capabilities = V4L2_DV_BT_CAP_PROGRESSIVE | - V4L2_DV_BT_CAP_REDUCED_BLANKING | V4L2_DV_BT_CAP_CUSTOM; + *cap = *adv76xx_get_dv_timings_cap(sd); return 0; } @@ -1475,15 +1504,9 @@ static int adv76xx_dv_timings_cap(struct v4l2_subdev *sd, static void adv76xx_fill_optional_dv_timings_fields(struct v4l2_subdev *sd, struct v4l2_dv_timings *timings) { - int i; - - for (i = 0; adv76xx_timings[i].bt.width; i++) { - if (v4l2_match_dv_timings(timings, &adv76xx_timings[i], - is_digital_input(sd) ? 250000 : 1000000, false)) { - *timings = adv76xx_timings[i]; - break; - } - } + v4l2_find_dv_timings_cap(timings, adv76xx_get_dv_timings_cap(sd), + is_digital_input(sd) ? 250000 : 1000000, + adv76xx_check_dv_timings, NULL); } static unsigned int adv7604_read_hdmi_pixelclock(struct v4l2_subdev *sd) @@ -1651,12 +1674,9 @@ static int adv76xx_s_dv_timings(struct v4l2_subdev *sd, bt = &timings->bt; - if ((is_analog_input(sd) && bt->pixelclock > 170000000) || - (is_digital_input(sd) && bt->pixelclock > 225000000)) { - v4l2_dbg(1, debug, sd, "%s: pixelclock out of range %d\n", - __func__, (u32)bt->pixelclock); + if (!v4l2_valid_dv_timings(timings, adv76xx_get_dv_timings_cap(sd), + adv76xx_check_dv_timings, NULL)) return -ERANGE; - } adv76xx_fill_optional_dv_timings_fields(sd, timings);
Use the helper to enumerate and set DV timings instead of a custom code. This will ease debugging too, as it is consistent with other drivers. Signed-off-by: Jean-Michel Hautbois <jean-michel.hautbois@veo-labs.com> --- v2: add an exception for V4L2_DV_BT_CEA_1280X720P30 timing drivers/media/i2c/adv7604.c | 114 ++++++++++++++++++++++++++------------------ 1 file changed, 67 insertions(+), 47 deletions(-)