[coreboot-gerrit] Change in coreboot[master]: [WIP]coreboot_tables: Support multiple framebuffers

[Patrick Rudolph (Code Review)]

Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/39005 )

Change subject: [WIP]coreboot_tables: Support multiple framebuffers
......................................................................

[WIP]coreboot_tables: Support multiple framebuffers

Advertise each framebuffer in a seperate CB table and get rid of
fill_lb_framebuffer.

Change-Id: I31c3da71ca0b96fb25219d6125c5f89d12157f74
Signed-off-by: Patrick Rudolph 
---
M src/include/boot/coreboot_tables.h
M src/lib/coreboot_table.c
M src/lib/edid_fill_fb.c
3 files changed, 23 insertions(+), 32 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/39005/1

diff --git a/src/include/boot/coreboot_tables.h b/src/include/boot/coreboot_tables.h
index 5bebd4a..3887a29 100644
--- a/src/include/boot/coreboot_tables.h
+++ b/src/include/boot/coreboot_tables.h
@@ -18,14 +18,11 @@
 void uart_fill_lb(void *data);
 void lb_add_serial(struct lb_serial *serial, void *data);
 void lb_add_console(uint16_t consoletype, void *data);
+void lb_framebuffer(struct lb_header *header);

/* Define this in mainboard.c to add board-specific table entries. */
 void lb_board(struct lb_header *header);

-/* Define this function to fill in the frame buffer returning 0 on success and
-   < 0 on error. */
-int fill_lb_framebuffer(struct lb_framebuffer *framebuffer);
-
 /* Allow arch to add records. */
 void lb_arch_add_records(struct lb_header *header);

diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c
index e42cb3b..3f9b2dc 100644
--- a/src/lib/coreboot_table.c
+++ b/src/lib/coreboot_table.c
@@ -133,28 +133,6 @@
    console->type = consoletype;
 }

-static void lb_framebuffer(struct lb_header *header)
-{
-	struct lb_framebuffer *framebuffer;
-	struct lb_framebuffer fb = {0};
-
-	if (!CONFIG(LINEAR_FRAMEBUFFER) || fill_lb_framebuffer(&fb))
-		return;
-
-	framebuffer = (struct lb_framebuffer *)lb_new_record(header);
-	memcpy(framebuffer, &fb, sizeof(*framebuffer));
-	framebuffer->tag = LB_TAG_FRAMEBUFFER;
-	framebuffer->size = sizeof(*framebuffer);
-
-	if (CONFIG(BOOTSPLASH)) {
-		uint8_t *fb_ptr = (uint8_t *)(uintptr_t)framebuffer->physical_address;
-		unsigned int width = framebuffer->x_resolution;
-		unsigned int height = framebuffer->y_resolution;
-		unsigned int depth = framebuffer->bits_per_pixel;
-		set_bootsplash(fb_ptr, width, height, depth);
-	}
-}
-
 void lb_add_gpios(struct lb_gpios *gpios, const struct lb_gpio *gpio_table,
    	  size_t count)
 {
@@ -531,8 +509,10 @@
    /* Record our various random string information */
    lb_strings(head);
    lb_record_version_timestamp(head);
+
    /* Record our framebuffer */
-	lb_framebuffer(head);
+	if (CONFIG(LINEAR_FRAMEBUFFER))
+		lb_framebuffer(head);

#if CONFIG(CHROMEOS)
    /* Record our GPIO settings (ChromeOS specific) */
diff --git a/src/lib/edid_fill_fb.c b/src/lib/edid_fill_fb.c
index 3abcdd0..1928335 100644
--- a/src/lib/edid_fill_fb.c
+++ b/src/lib/edid_fill_fb.c
@@ -36,6 +36,8 @@

/*
  * Allocate a new framebuffer info struct on heap.
+ * The caller must not free the returned pointer.
+ *
  * Returns NULL on error.
  */
 struct edid_fb_info *fb_new_framebuffer_info(void)
@@ -147,13 +149,25 @@
    return info;
 }

-int fill_lb_framebuffer(struct lb_framebuffer *framebuffer)
+void lb_framebuffer(struct lb_header *header)
 {
+	struct lb_framebuffer *framebuffer;
+
    for (struct edid_fb_info *i = list; i != NULL; i = i->next) {
-		if (i->valid) {
-			*framebuffer = i->edid_fb;
-			return 0;
+		if (!i->valid)
+			continue;
+
+		framebuffer = (struct lb_framebuffer *)lb_new_record(header);
+		memcpy(framebuffer, &i->edid_fb, sizeof(*framebuffer));
+		framebuffer->tag = LB_TAG_FRAMEBUFFER;
+		framebuffer->size = sizeof(*framebuffer);
+
+		if (CONFIG(BOOTSPLASH)) {
+			uint8_t *fb_ptr = (uint8_t *)(uintptr_t)framebuffer->physical_address;
+			unsigned int width = framebuffer->x_resolution;
+			unsigned int height = framebuffer->y_resolution;
+			unsigned int depth = framebuffer->bits_per_pixel;
+			set_bootsplash(fb_ptr, width, height, depth);
    	}
    }
-	return -1;
 }