[PULL,04/25] edid: use dta extension block descriptors

Commit Message

Gerd Hoffmann May 10, 2021, 1:20 p.m. UTC

When the 4 descriptors in the base edid block are filled, jump to the
dta extension block.  This allows for more than four descriptors.
Happens for example when generating an edid blob with a serial number
(qemu-edid -s $serial).

Signed-off-by: Gerd Hoffmann <[e-mail]>
Reviewed-by: Marc-André Lureau <[e-mail]>
Message-id: [e-mail]
Message-Id: <[e-mail]>
---
 hw/display/edid-generate.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Patch

diff --git a/hw/display/edid-generate.c b/hw/display/edid-generate.c
index 25f790c7bd85..42a130f0ff5c 100644
--- a/hw/display/edid-generate.c
+++ b/hw/display/edid-generate.c
@@ -152,6 +152,14 @@  static uint8_t *edid_desc_next(uint8_t *edid, uint8_t *dta, uint8_t *desc)
     if (desc + 18 + 18 < edid + 127) {
         return desc + 18;
     }
+    if (dta) {
+        if (desc < edid + 127) {
+            return dta + dta[2];
+        }
+        if (desc + 18 + 18 < dta + 127) {
+            return desc + 18;
+        }
+    }
     return NULL;
 }