Vladimir Serbinenko has submitted this change and it was merged. ( https://review.coreboot.org/13749 )
Change subject: vexpress: add gfx init ......................................................................
vexpress: add gfx init
Change-Id: I0eff29b74d7df331dcbf2c25799eaae4911e54fc Signed-off-by: Vladimir Serbinenko phcoder@gmail.com Reviewed-on: https://review.coreboot.org/13749 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Arthur Heymans arthur@aheymans.xyz --- M src/mainboard/emulation/qemu-armv7/Kconfig M src/mainboard/emulation/qemu-armv7/mainboard.c 2 files changed, 31 insertions(+), 0 deletions(-)
Approvals: Arthur Heymans: Looks good to me, approved build bot (Jenkins): Verified
Objections: Philippe Mathieu-Daudé: I would prefer that you didn't submit this
diff --git a/src/mainboard/emulation/qemu-armv7/Kconfig b/src/mainboard/emulation/qemu-armv7/Kconfig index 76bdb32..1a65ffb 100644 --- a/src/mainboard/emulation/qemu-armv7/Kconfig +++ b/src/mainboard/emulation/qemu-armv7/Kconfig @@ -27,6 +27,8 @@ select DRIVERS_UART_PL011 select BOOTBLOCK_CONSOLE select CONSOLE_SERIAL + select MAINBOARD_HAS_NATIVE_VGA_INIT + select MAINBOARD_DO_NATIVE_VGA_INIT select ARCH_BOOTBLOCK_ARMV7 select ARCH_ROMSTAGE_ARMV7 select ARCH_RAMSTAGE_ARMV7 diff --git a/src/mainboard/emulation/qemu-armv7/mainboard.c b/src/mainboard/emulation/qemu-armv7/mainboard.c index eced9ae..c1fcc6a 100644 --- a/src/mainboard/emulation/qemu-armv7/mainboard.c +++ b/src/mainboard/emulation/qemu-armv7/mainboard.c @@ -20,6 +20,34 @@ #include <string.h> #include <halt.h> #include "mainboard.h" +#include <edid.h> + +static void init_gfx(void) +{ + volatile uint32_t *pl111; + struct edid edid; + /* width is at most 4096 */ + /* height is at most 1024 */ + int width = 800, height = 600; + uint32_t framebuffer = 0x4c000000; + pl111 = (uint32_t *) 0x10020000; + pl111[0] = (width / 4) - 4; + pl111[1] = height - 1; + /* registers 2, 3 and 5 are ignored by qemu. Set them correctly if + we ever go for real hw. */ + /* framebuffer adress offset. Has to be in vram. */ + pl111[4] = framebuffer; + pl111[7] = 0; + pl111[10] = 0xff; + pl111[6] = (5 << 1) | 0x801; + + edid.framebuffer_bits_per_pixel = 32; + edid.bytes_per_line = width * 4; + edid.x_resolution = width; + edid.y_resolution = height; + + set_vbe_mode_info_valid(&edid, framebuffer); +}
static void mainboard_enable(device_t dev) { @@ -33,6 +61,7 @@ printk(BIOS_DEBUG, "%d MiB of RAM discovered\n", discovered); ram_resource(dev, 0, 0x60000000 >> 10, discovered << 10); cbmem_recovery(0); + init_gfx(); }
struct chip_operations mainboard_ops = {