From 0bc3e325c922a1528e75f668ff211f7310a4262b Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 4 Sep 2015 12:58:00 +0200 Subject: [PATCH] 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 Reviewed-on: http://review.coreboot.org/11502 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Alexandru Gagniuc --- src/drivers/emulation/qemu/bochs.c | 4 ++-- src/drivers/emulation/qemu/cirrus.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/drivers/emulation/qemu/bochs.c b/src/drivers/emulation/qemu/bochs.c index cb0075aec1..ae2975d543 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 ffc977229b..be8afdffa9 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;