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/drivers/intel/fsp2_0/graphics.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/drivers/intel/fsp2_0') diff --git a/src/drivers/intel/fsp2_0/graphics.c b/src/drivers/intel/fsp2_0/graphics.c index 97fffdc290..cfd3d16428 100644 --- a/src/drivers/intel/fsp2_0/graphics.c +++ b/src/drivers/intel/fsp2_0/graphics.c @@ -88,8 +88,7 @@ enum cb_err fsp_fill_lb_framebuffer(struct lb_framebuffer *framebuffer) framebuffer->blue_mask_size = fbinfo->blue.size; framebuffer->reserved_mask_pos = fbinfo->rsvd.pos; framebuffer->reserved_mask_size = fbinfo->rsvd.pos; - framebuffer->tag = LB_TAG_FRAMEBUFFER; - framebuffer->size = sizeof(*framebuffer); + return CB_SUCCESS; } @@ -104,10 +103,9 @@ uintptr_t fsp_load_vbt(void) return (uintptr_t)vbt; } -void lb_framebuffer(struct lb_header *header) +int fill_lb_framebuffer(struct lb_framebuffer *framebuffer) { enum cb_err ret; - struct lb_framebuffer *framebuffer; uintptr_t framebuffer_bar; /* Pci enumeration happens after silicon init. @@ -118,20 +116,21 @@ void lb_framebuffer(struct lb_header *header) if (!framebuffer_bar) { printk(BIOS_ALERT, "Framebuffer BAR invalid\n"); - return; + return -1; } - framebuffer = (void *)lb_new_record(header); ret = fsp_fill_lb_framebuffer(framebuffer); if (ret != CB_SUCCESS) { printk(BIOS_ALERT, "FSP did not return a valid framebuffer\n"); - return; + return -1; } /* Resource allocator can move the BAR around after FSP configures it */ framebuffer->physical_address = framebuffer_bar; printk(BIOS_DEBUG, "Graphics framebuffer located at 0x%llx\n", framebuffer->physical_address); + + return 0; } __attribute__((weak)) uintptr_t fsp_soc_get_igd_bar(void) -- cgit v1.2.3