diff options
author | Martin Bugge <marbugge@cisco.com> | 2013-08-14 08:24:33 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-08-24 03:25:11 -0400 |
commit | 15edc1ccdb29fe7cd55d329948c134c090a88b64 (patch) | |
tree | 3fad49441a98344377e67453461e9edd897377fe /drivers/media | |
parent | 7be4f888112eeebd7ce33bca49b3a1df1fd52295 (diff) |
[media] ad9389b: trigger edid re-read by power-cycle chip
Signed-off-by: Martin Bugge <marbugge@cisco.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/i2c/ad9389b.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/i2c/ad9389b.c b/drivers/media/i2c/ad9389b.c index 52384e83cde9..545aabbdae68 100644 --- a/drivers/media/i2c/ad9389b.c +++ b/drivers/media/i2c/ad9389b.c | |||
@@ -855,8 +855,10 @@ static void ad9389b_edid_handler(struct work_struct *work) | |||
855 | * (DVI connectors are particularly prone to this problem). */ | 855 | * (DVI connectors are particularly prone to this problem). */ |
856 | if (state->edid.read_retries) { | 856 | if (state->edid.read_retries) { |
857 | state->edid.read_retries--; | 857 | state->edid.read_retries--; |
858 | /* EDID read failed, trigger a retry */ | 858 | v4l2_dbg(1, debug, sd, "%s: edid read failed\n", __func__); |
859 | ad9389b_wr(sd, 0xc9, 0xf); | 859 | state->have_monitor = false; |
860 | ad9389b_s_power(sd, false); | ||
861 | ad9389b_s_power(sd, true); | ||
860 | queue_delayed_work(state->work_queue, | 862 | queue_delayed_work(state->work_queue, |
861 | &state->edid_handler, EDID_DELAY); | 863 | &state->edid_handler, EDID_DELAY); |
862 | return; | 864 | return; |
@@ -1019,7 +1021,6 @@ static bool ad9389b_check_edid_status(struct v4l2_subdev *sd) | |||
1019 | segment = ad9389b_rd(sd, 0xc4); | 1021 | segment = ad9389b_rd(sd, 0xc4); |
1020 | if (segment >= EDID_MAX_SEGM) { | 1022 | if (segment >= EDID_MAX_SEGM) { |
1021 | v4l2_err(sd, "edid segment number too big\n"); | 1023 | v4l2_err(sd, "edid segment number too big\n"); |
1022 | state->have_monitor = false; | ||
1023 | return false; | 1024 | return false; |
1024 | } | 1025 | } |
1025 | v4l2_dbg(1, debug, sd, "%s: got segment %d\n", __func__, segment); | 1026 | v4l2_dbg(1, debug, sd, "%s: got segment %d\n", __func__, segment); |