ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vga: bugfixes for qxl and edid generator. 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABCgAGBQJeXM7sAAoJEEy22O7T6HE4Yh0P/R5MgUPgIcdD86Egid94tatL
 odDc56C01ejsYGwIcchK4rEVeLIDvfISIuKhRc7FIUoutuyffWl8lTk6jVrYAboF
 5D6X9jYwncTluDpttTNldUgZDbv/zQSa5TAKhB7NegKMIAjr3WaW1yY2YW9bb1FJ
 gwfq1Eaksidd1axtUoRMyE372MLVvDhaIJtFS9481OTuQ41Pb70Gn9BwnihzJiG1
 JBos9p09XUI1YTSnqqXggpdAaQTcsFEBI6D+xRyClBHo0o5UQ1NEEpqBE0fgetsn
 Hu4WXY1rwNYHuGpOGx6HIccqhvQhKY7uOZiq9g+Br6tmWucS/WL2YnrFWe8Ihr0i
 UCPKqydu59AaEgxsWZfuNRs/2jLje/4OEc1NrzYBPZrBXK2CqsQf5bIULiQljUvC
 MjpcvNI9e3pCxJfciXtnLLwVHWHIElH9kXevM61/BjEapS/xr6SRwdUwp8uuWBmw
 O+RvmYHaPwO6a+KObtzF+VYPaqA/lTHMEfuAIJ+AnSYhorMY0uvnOww4a9kKUETR
 F7wxUs1bRSUZZRSfe8/Ceen1UEwRQJs9aj4HuVWS9zJqYnamczHgeCtqg+JZkhjH
 Nz5ynSG2JMNrg1nQKo8mCRHL53nHfBRFcbWc5PKIfuohyOlaENPFEVKAchjXFUl+
 Z+/HKJ3LoIa2GS5G0xiK
 =jUo0
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/kraxel/tags/vga-20200302-pull-request' into staging

vga: bugfixes for qxl and edid generator.

# gpg: Signature made Mon 02 Mar 2020 09:16:28 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/vga-20200302-pull-request:
  qxl: map rom r/o
  Arithmetic error in EDID generation fixed

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2020-03-02 14:11:54 +00:00
parent 9f1750ed68 44b5c1ebfa
commit c81acb643a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,8 +360,8 @@ void qemu_edid_generate(uint8_t *edid, size_t size,
edid[20] = 0xa5;
/* screen size: undefined */
edid[21] = info->prefx * info->dpi / 2540;
edid[22] = info->prefy * info->dpi / 2540;
edid[21] = info->prefx * 254 / 100 / info->dpi;
edid[22] = info->prefy * 254 / 100 / info->dpi;
/* display gamma: 2.2 */
edid[23] = 220 - 100;

2
hw/display/qxl.c
View File

@ -2136,7 +2136,7 @@ static void qxl_realize_common(PCIQXLDevice *qxl, Error **errp)
pci_set_byte(&config[PCI_INTERRUPT_PIN], 1);
qxl->rom_size = qxl_rom_size();
memory_region_init_ram(&qxl->rom_bar, OBJECT(qxl), "qxl.vrom",
memory_region_init_rom(&qxl->rom_bar, OBJECT(qxl), "qxl.vrom",
qxl->rom_size, &error_fatal);
init_qxl_rom(qxl);
init_qxl_ram(qxl);