2 files changed, 12 insertions, 22 deletions
diff --git a/src/soc/nvidia/tegra124/display.c b/src/soc/nvidia/tegra124/display.c
index 485e032c1921..5935d0d16994 100644
--- a/src/soc/nvidia/tegra124/display.c
+++ b/src/soc/nvidia/tegra124/display.c
@@ -14,6 +14,7 @@
 #include <soc/nvidia/tegra/pwm.h>
 #include <stdint.h>
 #include <string.h>
+#include <framebuffer_info.h>
 
 #include "chip.h"
 
@@ -312,10 +313,9 @@ void display_startup(struct device *dev)
 
 	/* tell depthcharge ...
 	 */
-	struct edid edid;
-	edid.mode.va = config->yres;
-	edid.mode.ha = config->xres;
-	edid_set_framebuffer_bits_per_pixel(&edid,
-		config->framebuffer_bits_per_pixel, 32);
-	set_vbe_mode_info_valid(&edid, (uintptr_t)(framebuffer_base_mb*MiB));
+	const uint32_t bytes_per_line = ALIGN_UP(config->xres *
+		DIV_ROUND_UP(config->framebuffer_bits_per_pixel, 8), 32);
+
+	fb_add_framebuffer_info(framebuffer_base_mb*MiB, config->xres, config->yres,
+				bytes_per_line, config->framebuffer_bits_per_pixel);
 }
diff --git a/src/soc/nvidia/tegra210/dc.c b/src/soc/nvidia/tegra210/dc.c
index 8625f76a8cd1..0c54f7a304b1 100644
--- a/src/soc/nvidia/tegra210/dc.c
+++ b/src/soc/nvidia/tegra210/dc.c
@@ -3,10 +3,10 @@
 #include <console/console.h>
 #include <device/mmio.h>
 #include <stdint.h>
-#include <edid.h>
 #include <device/device.h>
 #include <soc/nvidia/tegra/dc.h>
 #include <soc/display.h>
+#include <framebuffer_info.h>
 
 #include "chip.h"
 
@@ -212,19 +212,9 @@ int tegra_dc_init(struct display_controller *disp_ctrl)
 void pass_mode_info_to_payload(
 			struct soc_nvidia_tegra210_config *config)
 {
-	struct edid edid;
-
-	edid.mode.va = config->display_yres;
-	edid.mode.ha = config->display_xres;
-	edid_set_framebuffer_bits_per_pixel(&edid,
-		config->framebuffer_bits_per_pixel, 64);
-
-	printk(BIOS_INFO, "%s: bytes_per_line: %d, bits_per_pixel: %d\n "
-			"               x_res x y_res: %d x %d, size: %d\n",
-			 __func__, edid.bytes_per_line,
-			edid.framebuffer_bits_per_pixel,
-			edid.x_resolution, edid.y_resolution,
-			(edid.bytes_per_line * edid.y_resolution));
-
-	set_vbe_mode_info_valid(&edid, 0);
+	const uint32_t bytes_per_line = ALIGN_UP(config->display_xres *
+		DIV_ROUND_UP(config->framebuffer_bits_per_pixel, 8), 64);
+	/* The framebuffer address is zero to let the payload allocate it */
+	fb_add_framebuffer_info(0, config->display_xres, config->display_yres,
+					bytes_per_line, config->framebuffer_bits_per_pixel);
 }