media: adv7511-v4l2: add support for the EEODB

Support the HDMI Forum EDID Extension Override Data Block
by using the new v4l2_num_edid_blocks helper function.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/i2c/adv7511-v4l2.c b/drivers/media/i2c/adv7511-v4l2.c
index 4036972af3a6628b72de0c770b13ba829742ff2f..f95a99d85360aa782279a127eee37132f9ad08fb 100644 (file)
--- a/drivers/media/i2c/adv7511-v4l2.c
+++ b/drivers/media/i2c/adv7511-v4l2.c
@@ -1664,7 +1664,9 @@ static bool adv7511_check_edid_status(struct v4l2_subdev *sd)
                if (!err) {
                        adv7511_dbg_dump_edid(2, debug, sd, segment, &state->edid.data[segment * 256]);
                        if (segment == 0) {
-                               state->edid.blocks = state->edid.data[0x7e] + 1;
+                               state->edid.blocks =
+                                       v4l2_num_edid_blocks(state->edid.data,
+                                                            EDID_MAX_SEGM * 2);
                                v4l2_dbg(1, debug, sd, "%s: %d blocks in total\n",
                                         __func__, state->edid.blocks);
                        }
@@ -1682,7 +1684,7 @@ static bool adv7511_check_edid_status(struct v4l2_subdev *sd)
                /* one more segment read ok */
                state->edid.segments = segment + 1;
                v4l2_ctrl_s_ctrl(state->have_edid0_ctrl, 0x1);
-               if (((state->edid.data[0x7e] >> 1) + 1) > state->edid.segments) {
+               if (state->edid.blocks > state->edid.segments * 2) {
                        /* Request next EDID segment */
                        v4l2_dbg(1, debug, sd, "%s: request segment %d\n", __func__, state->edid.segments);
                        adv7511_wr(sd, 0xc9, 0xf);