From bdb5c8feaed4cf914b474deeb30686e327ee9228 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Tue, 16 May 2017 21:39:50 -0500 Subject: coreboot_tables: specify clear interface for lb_framebuffer() For some reason the "interface" for adding framebuffer information is sitting in src/include/vbe.h while also guarding the call to fill_lb_framebuffer() with vbe_mode_info_valid() along with some macro if CONFIG_* for good measure. Move the fill_lb_framebuffer() declaration to coreboot_tables.h and provide a comment about how it should be used. Also, now that there's no need for the notion of a global vbe_mode_info_valid() remove it from the conditional call path of fill_lb_framebuffer(). Change-Id: Ib3ade6314624091ae70424664527a02b279d0c9b Signed-off-by: Aaron Durbin Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/19729 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- src/lib/coreboot_table.c | 21 +++++++++++---------- src/lib/edid.c | 10 +++++----- 2 files changed, 16 insertions(+), 15 deletions(-) (limited to 'src/lib') diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c index ecefba544c..f3cdb0bb14 100644 --- a/src/lib/coreboot_table.c +++ b/src/lib/coreboot_table.c @@ -135,22 +135,23 @@ void lb_add_console(uint16_t consoletype, void *data) console->type = consoletype; } -void __attribute__((weak)) lb_framebuffer(struct lb_header *header) +int __attribute__((weak)) fill_lb_framebuffer(struct lb_framebuffer *fb) { -#if CONFIG_FRAMEBUFFER_KEEP_VESA_MODE || CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT - void fill_lb_framebuffer(struct lb_framebuffer *framebuffer); - int vbe_mode_info_valid(void); + return -1; +} - // If there isn't any mode info to put in the table, don't ask for it - // to be filled with junk. - if (!vbe_mode_info_valid()) - return; +static void lb_framebuffer(struct lb_header *header) +{ struct lb_framebuffer *framebuffer; + struct lb_framebuffer fb; + + if (fill_lb_framebuffer(&fb)) + return; + framebuffer = (struct lb_framebuffer *)lb_new_record(header); - fill_lb_framebuffer(framebuffer); + memcpy(framebuffer, &fb, sizeof(*framebuffer)); framebuffer->tag = LB_TAG_FRAMEBUFFER; framebuffer->size = sizeof(*framebuffer); -#endif } void lb_add_gpios(struct lb_gpios *gpios, const struct lb_gpio *gpio_table, diff --git a/src/lib/edid.c b/src/lib/edid.c index 405b3fdbc1..2216690963 100644 --- a/src/lib/edid.c +++ b/src/lib/edid.c @@ -1750,13 +1750,13 @@ void set_vbe_mode_info_valid(const struct edid *edid, uintptr_t fb_addr) } #if IS_ENABLED(CONFIG_NATIVE_VGA_INIT_USE_EDID) -int vbe_mode_info_valid(void) +int fill_lb_framebuffer(struct lb_framebuffer *framebuffer) { - return vbe_valid; -} + if (!vbe_valid) + return -1; -void fill_lb_framebuffer(struct lb_framebuffer *framebuffer) -{ *framebuffer = edid_fb; + + return 0; } #endif -- cgit v1.2.3