xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-27 13:30:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

edid: move xtra3 descriptor

Browse Source 
Initialize the "Established timings III" block earlier.  Also move up
edid_fill_modes().  That'll make sure the offset for the additional
descriptors in the dta block don't move any more, which in turn makes it
easier to actually use them.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20210427150824.638359-1-kraxel@redhat.com
Message-Id: <20210427150824.638359-4-kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2021-04-27 17:08:19 +02:00
parent ed7f17a640
commit ec70aec8dc
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/display/edid-generate.c
View File

@ -416,25 +416,28 @@ void qemu_edid_generate(uint8_t *edid, size_t size,
width_mm, height_mm);
desc = edid_desc_next(edid, dta, desc);
xtra3 = desc;
edid_desc_xtra3_std(xtra3);
desc = edid_desc_next(edid, dta, desc);
edid_fill_modes(edid, xtra3, dta, info->maxx, info->maxy);
/*
* dta video data block is finished at thus point,
* so dta descriptor offsets don't move any more.
*/
edid_desc_ranges(desc);
desc = edid_desc_next(edid, dta, desc);
if (info->name) {
if (desc && info->name) {
edid_desc_text(desc, 0xfc, info->name);
desc = edid_desc_next(edid, dta, desc);
}
if (info->serial) {
if (desc && info->serial) {
edid_desc_text(desc, 0xff, info->serial);
desc = edid_desc_next(edid, dta, desc);
}
if (desc) {
xtra3 = desc;
edid_desc_xtra3_std(xtra3);
desc = edid_desc_next(edid, dta, desc);
}
while (desc) {
edid_desc_dummy(desc);
desc = edid_desc_next(edid, dta, desc);
@ -442,7 +445,6 @@ void qemu_edid_generate(uint8_t *edid, size_t size,
/* =============== finish up =============== */
edid_fill_modes(edid, xtra3, dta, info->maxx, info->maxy);
edid_checksum(edid);
if (dta) {
edid_checksum(dta);