summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2014-08-27 11:23:35 +0200
committerGerd Hoffmann <kraxel@redhat.com>2014-08-28 07:50:53 +0200
commit2177f1bcb5420a69957e7146c1b77e8f4c4d8aa8 (patch)
treeb608f9c1b4cbe0f0d76e7db0ffb611a743751fcf
parent4f62732858ef5d332c6f646c3302b5e7c0f5e436 (diff)
qemu: fix cirrus build
commit 9518b56 (intel/gma: Clarify code and use dedicated init for Google Peppy) changed "struct edid" and thereby broke the build. Adapt drivers/emulation/qemu/bochs.c to the changes to fix this. Build failure triggers with CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y. Change-Id: I2d3cecde21d495e9b99ff8d2f741f8a462c75a4d Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-on: http://review.coreboot.org/6771 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rw-r--r--src/drivers/emulation/qemu/cirrus.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/drivers/emulation/qemu/cirrus.c b/src/drivers/emulation/qemu/cirrus.c
index 5f8a01ec3e..c96e032216 100644
--- a/src/drivers/emulation/qemu/cirrus.c
+++ b/src/drivers/emulation/qemu/cirrus.c
@@ -338,7 +338,9 @@ static void cirrus_init(device_t dev)
edid.x_resolution = width;
edid.y_resolution = height;
edid.bytes_per_line = width * 4;
- edid.bpp = 32;
+ edid.framebuffer_bits_per_pixel = 32;
+ edid.panel_bits_per_color = 8;
+ edid.panel_bits_per_pixel = 24;
set_vbe_mode_info_valid(&edid, addr);
#else
vga_misc_write(0x1);