summaryrefslogtreecommitdiffstats
path: root/src/drivers
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2015-09-04 12:58:00 +0200
committerStefan Reinauer <stefan.reinauer@coreboot.org>2015-09-05 15:48:03 +0000
commit0bc3e325c922a1528e75f668ff211f7310a4262b (patch)
tree9b0d573edce5e48580ace55ffe3e72f5ba4b0253 /src/drivers
parent037581542b8e4571437ea34fb0244ad2ef43b6a3 (diff)
downloadcoreboot-0bc3e325c922a1528e75f668ff211f7310a4262b.tar.gz
coreboot-0bc3e325c922a1528e75f668ff211f7310a4262b.tar.bz2
coreboot-0bc3e325c922a1528e75f668ff211f7310a4262b.zip
qemu: fix vga driver build
Commit "7dbf9c6 edid: Use edid_mode struct to reduce redundancy" moved some fields from "struct edid" to "struct edid_mode". Adapt the bochs and cirrus drivers to that change. Change-Id: I9ec82a403d0264955d4b72496219036c7775c758 Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-on: http://review.coreboot.org/11502 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/emulation/qemu/bochs.c4
-rw-r--r--src/drivers/emulation/qemu/cirrus.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/drivers/emulation/qemu/bochs.c b/src/drivers/emulation/qemu/bochs.c
index cb0075aec17a..ae2975d5438f 100644
--- a/src/drivers/emulation/qemu/bochs.c
+++ b/src/drivers/emulation/qemu/bochs.c
@@ -109,8 +109,8 @@ static void bochs_init(struct device *dev)
outb(0x20, 0x3c0); /* disable blanking */
/* setup coreboot framebuffer */
- edid.ha = width;
- edid.va = height;
+ edid.mode.ha = width;
+ edid.mode.va = height;
edid.x_resolution = width;
edid.y_resolution = height;
edid.bytes_per_line = width * 4;
diff --git a/src/drivers/emulation/qemu/cirrus.c b/src/drivers/emulation/qemu/cirrus.c
index ffc977229ba6..be8afdffa917 100644
--- a/src/drivers/emulation/qemu/cirrus.c
+++ b/src/drivers/emulation/qemu/cirrus.c
@@ -332,8 +332,8 @@ static void cirrus_init(struct device *dev)
struct edid edid;
- edid.ha = width;
- edid.va = height;
+ edid.mode.ha = width;
+ edid.mode.va = height;
edid.x_resolution = width;
edid.y_resolution = height;
edid.bytes_per_line = width * 4;