Commit 14d03233 authored by Mats Randgaard's avatar Mats Randgaard Committed by Mauro Carvalho Chehab

[media] adv7604: remove debouncing of ADV7604_FMT_CHANGE events

ADV7604_FMT_CHANGE events was debounced in adv7604_isr() to avoid
that a receiver with a unstable input signal would block the event
handling for other inputs. This solution was prone to errors.

A better protection agains interrupt blocking is to delay the call
of the interrupt service routine in the adv7604 driver if too many
interrupts are received within a given time.
Signed-off-by: default avatarMats Randgaard <matrandg@cisco.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent ff4f80fd
...@@ -78,7 +78,6 @@ struct adv7604_state { ...@@ -78,7 +78,6 @@ struct adv7604_state {
struct workqueue_struct *work_queues; struct workqueue_struct *work_queues;
struct delayed_work delayed_work_enable_hotplug; struct delayed_work delayed_work_enable_hotplug;
bool restart_stdi_once; bool restart_stdi_once;
u32 prev_input_status;
/* i2c clients */ /* i2c clients */
struct i2c_client *i2c_avlink; struct i2c_client *i2c_avlink;
...@@ -1524,9 +1523,7 @@ static int adv7604_g_mbus_fmt(struct v4l2_subdev *sd, ...@@ -1524,9 +1523,7 @@ static int adv7604_g_mbus_fmt(struct v4l2_subdev *sd,
static int adv7604_isr(struct v4l2_subdev *sd, u32 status, bool *handled) static int adv7604_isr(struct v4l2_subdev *sd, u32 status, bool *handled)
{ {
struct adv7604_state *state = to_state(sd);
u8 fmt_change, fmt_change_digital, tx_5v; u8 fmt_change, fmt_change_digital, tx_5v;
u32 input_status;
v4l2_dbg(2, debug, sd, "%s: ", __func__); v4l2_dbg(2, debug, sd, "%s: ", __func__);
...@@ -1534,22 +1531,17 @@ static int adv7604_isr(struct v4l2_subdev *sd, u32 status, bool *handled) ...@@ -1534,22 +1531,17 @@ static int adv7604_isr(struct v4l2_subdev *sd, u32 status, bool *handled)
fmt_change = io_read(sd, 0x43) & 0x98; fmt_change = io_read(sd, 0x43) & 0x98;
if (fmt_change) if (fmt_change)
io_write(sd, 0x44, fmt_change); io_write(sd, 0x44, fmt_change);
fmt_change_digital = is_digital_input(sd) ? (io_read(sd, 0x6b) & 0xc0) : 0; fmt_change_digital = is_digital_input(sd) ? (io_read(sd, 0x6b) & 0xc0) : 0;
if (fmt_change_digital) if (fmt_change_digital)
io_write(sd, 0x6c, fmt_change_digital); io_write(sd, 0x6c, fmt_change_digital);
if (fmt_change || fmt_change_digital) { if (fmt_change || fmt_change_digital) {
v4l2_dbg(1, debug, sd, v4l2_dbg(1, debug, sd,
"%s: fmt_change = 0x%x, fmt_change_digital = 0x%x\n", "%s: fmt_change = 0x%x, fmt_change_digital = 0x%x\n",
__func__, fmt_change, fmt_change_digital); __func__, fmt_change, fmt_change_digital);
adv7604_g_input_status(sd, &input_status);
if (input_status != state->prev_input_status) {
v4l2_dbg(1, debug, sd,
"%s: input_status = 0x%x, prev_input_status = 0x%x\n",
__func__, input_status, state->prev_input_status);
state->prev_input_status = input_status;
v4l2_subdev_notify(sd, ADV7604_FMT_CHANGE, NULL); v4l2_subdev_notify(sd, ADV7604_FMT_CHANGE, NULL);
}
if (handled) if (handled)
*handled = true; *handled = true;
...@@ -2129,7 +2121,6 @@ static int adv7604_probe(struct i2c_client *client, ...@@ -2129,7 +2121,6 @@ static int adv7604_probe(struct i2c_client *client,
/* initialize variables */ /* initialize variables */
state->restart_stdi_once = true; state->restart_stdi_once = true;
state->prev_input_status = ~0;
state->selected_input = ~0; state->selected_input = ~0;
/* platform data */ /* platform 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