Skip to contentSkip to conversation

media: add support for the EDID EEODB

PATCH Superseded Hans Verkuil 1 participant 3 messages Jan 21, 2025

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover media: add support for the EDID EEODB

Add support for the HDMI Forum EDID Extension Override Data Block by introducing the v4l2_num_edid_blocks() helper function.

Update the adv7511-v4l2 driver to use this new function. This fixes adv7511 support for EDIDs using the EEODB as otherwise only the first two blocks would be read.

Regards,

Hans

Hans Verkuil (2):
media: v4l2-dv-timings: add v4l2_num_edid_blocks() helper
media: adv7511-v4l2: add support for the EEODB

 drivers/media/i2c/adv7511-v4l2.c          |  6 +++--
 drivers/media/v4l2-core/v4l2-dv-timings.c | 29 +++++++++++++++++++++++
 include/media/v4l2-dv-timings.h           |  1 +
 3 files changed, 34 insertions(+), 2 deletions(-)
Signature · 1 line
2.45.2
#1 lore raw

PATCH 1/2 media: v4l2-dv-timings: add v4l2_num_edid_blocks() helper

This new function determines how many blocks the EDID has. Traditionally the number of extension blocks is read from the EDID at offset 126, but this can be overridden by the HDMI Forum EDID Extension Override Data Block. So check that as well in this helper.

---
 drivers/media/v4l2-core/v4l2-dv-timings.c | 29 +++++++++++++++++++++++
 include/media/v4l2-dv-timings.h           |  1 +
 2 files changed, 30 insertions(+)
drivers/media/v4l2-core/v4l2-dv-timings.c +29 -0
index d26edf157e64..f17766b2d800 100644
@@ -1017,6 +1017,35 @@ v4l2_hdmi_rx_colorimetry(const struct hdmi_avi_infoframe *avi,
 }
 EXPORT_SYMBOL_GPL(v4l2_hdmi_rx_colorimetry);
 
+/**
+ * v4l2_num_edid_blocks() - return the number of EDID blocks
+ *
+ * @edid:	pointer to the EDID data
+ * @max_blocks:	maximum number of supported EDID blocks
+ *
+ * Return: the number of EDID blocks based on the contents of the EDID.
+ *	   This supports the HDMI Forum EDID Extension Override Data Block.
+ */
+unsigned int v4l2_num_edid_blocks(const u8 *edid, unsigned int max_blocks)
+{
+	unsigned int blocks = 0;
+
+	if (edid && max_blocks) {
+		blocks = edid[126] + 1;
+		// Check for HDMI Forum EDID Extension Override Data Block
+		if (blocks >= 2 &&
+		    max_blocks >= 3 &&
+		    edid[128] == 2 &&
+		    edid[133] == 0x78 &&
+		    (edid[132] & 0xe0) == 0xe0 &&
+		    (edid[132] & 0x1f) >= 2 &&
+		    edid[134] > 1)
+			blocks = edid[134] + 1;
+	}
+	return blocks > max_blocks ? max_blocks : blocks;
+}
+EXPORT_SYMBOL_GPL(v4l2_num_edid_blocks);
+
 /**
  * v4l2_get_edid_phys_addr() - find and return the physical address
  *
include/media/v4l2-dv-timings.h +1 -0
index ff07dc6b103c..714075c72f77 100644
@@ -252,6 +252,7 @@ v4l2_hdmi_rx_colorimetry(const struct hdmi_avi_infoframe *avi,
 			 const struct hdmi_vendor_infoframe *hdmi,
 			 unsigned int height);
 
+unsigned int v4l2_num_edid_blocks(const u8 *edid, unsigned int max_blocks);
 u16 v4l2_get_edid_phys_addr(const u8 *edid, unsigned int size,
 			    unsigned int *offset);
 void v4l2_set_edid_phys_addr(u8 *edid, unsigned int size, u16 phys_addr);
Signature · 1 line
2.45.2
#2 lore raw

PATCH 2/2 media: adv7511-v4l2: add support for the EEODB

In reply to Hans Verkuil

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

---
 drivers/media/i2c/adv7511-v4l2.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/media/i2c/adv7511-v4l2.c +4 -2
index 4036972af3a6..f95a99d85360 100644
@@ -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);
Signature · 1 line
2.45.2