From: Bin Meng Date: Thu, 13 Aug 2015 07:29:16 +0000 (-0700) Subject: video: coreboot: Save VESA mode for future use X-Git-Tag: KARO-TX6-2015-09-18~165 X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=f01cf020b5fcfdbaedd267c229e3d5401dec2425 video: coreboot: Save VESA mode for future use When booting as a coreboot payload, the framebuffer details are passed from coreboot via configuration tables. We save these information into vesa_mode_info structure for future use. Signed-off-by: Bin Meng --- diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c index 26db3ca0a1..b9a3990ecc 100644 --- a/drivers/pci/pci_rom.c +++ b/drivers/pci/pci_rom.c @@ -187,7 +187,7 @@ int pci_rom_load(struct pci_rom_header *rom_header, return 0; } -static struct vbe_mode_info mode_info; +struct vbe_mode_info mode_info; int vbe_get_video_info(struct graphic_device *gdev) { diff --git a/drivers/video/coreboot_fb.c b/drivers/video/coreboot_fb.c index 56c35c18fe..4790ef1fdc 100644 --- a/drivers/video/coreboot_fb.c +++ b/drivers/video/coreboot_fb.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include "videomodes.h" @@ -17,6 +18,26 @@ */ GraphicDevice ctfb; +static void save_vesa_mode(void) +{ + struct vesa_mode_info *vesa = &mode_info.vesa; + struct cb_framebuffer *fb = lib_sysinfo.framebuffer; + + vesa->x_resolution = fb->x_resolution; + vesa->y_resolution = fb->y_resolution; + vesa->bits_per_pixel = fb->bits_per_pixel; + vesa->bytes_per_scanline = fb->bytes_per_line; + vesa->phys_base_ptr = fb->physical_address; + vesa->red_mask_size = fb->red_mask_size; + vesa->red_mask_pos = fb->red_mask_pos; + vesa->green_mask_size = fb->green_mask_size; + vesa->green_mask_pos = fb->green_mask_pos; + vesa->blue_mask_size = fb->blue_mask_size; + vesa->blue_mask_pos = fb->blue_mask_pos; + vesa->reserved_mask_size = fb->reserved_mask_size; + vesa->reserved_mask_pos = fb->reserved_mask_pos; +} + static int parse_coreboot_table_fb(GraphicDevice *gdev) { struct cb_framebuffer *fb = lib_sysinfo.framebuffer; @@ -81,5 +102,8 @@ void *video_hw_init(void) memset((void *)gdev->pciBase, 0, gdev->winSizeX * gdev->winSizeY * gdev->gdfBytesPP); + /* Initialize vesa_mode_info structure */ + save_vesa_mode(); + return (void *)gdev; } diff --git a/include/vbe.h b/include/vbe.h index 1a86db886a..164ccae280 100644 --- a/include/vbe.h +++ b/include/vbe.h @@ -102,6 +102,8 @@ struct vbe_ddc_info { #define VESA_SET_MODE 0x4f02 #define VESA_GET_CUR_MODE 0x4f03 +extern struct vbe_mode_info mode_info; + struct graphic_device; int vbe_get_video_info(struct graphic_device *gdev);