summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/drivers/aspeed/common/ast_mode_corebootfb.c5
-rw-r--r--src/drivers/emulation/qemu/bochs.c12
-rw-r--r--src/drivers/emulation/qemu/cirrus.c10
-rw-r--r--src/include/edid.h2
-rw-r--r--src/include/framebuffer_info.h4
-rw-r--r--src/lib/edid_fill_fb.c3
-rw-r--r--src/mainboard/emulation/qemu-armv7/mainboard.c10
-rw-r--r--src/mainboard/google/asurada/mainboard.c3
-rw-r--r--src/mainboard/google/daisy/mainboard.c13
-rw-r--r--src/mainboard/google/kukui/mainboard.c2
-rw-r--r--src/mainboard/google/oak/mainboard.c3
-rw-r--r--src/mainboard/google/peach_pit/mainboard.c13
-rw-r--r--src/mainboard/google/trogdor/mainboard.c3
-rw-r--r--src/northbridge/intel/i945/gma.c3
-rw-r--r--src/soc/nvidia/tegra124/display.c12
-rw-r--r--src/soc/nvidia/tegra210/dc.c22
-rw-r--r--src/soc/rockchip/rk3288/display.c3
-rw-r--r--src/soc/rockchip/rk3399/display.c3
18 files changed, 45 insertions, 81 deletions
diff --git a/src/drivers/aspeed/common/ast_mode_corebootfb.c b/src/drivers/aspeed/common/ast_mode_corebootfb.c
index bb30d20acd..b25d742f01 100644
--- a/src/drivers/aspeed/common/ast_mode_corebootfb.c
+++ b/src/drivers/aspeed/common/ast_mode_corebootfb.c
@@ -6,6 +6,7 @@
#include <console/console.h>
#include <edid.h>
#include <device/pci_def.h>
+#include <framebuffer_info.h>
#include "ast_drv.h"
@@ -200,7 +201,7 @@ int ast_driver_framebuffer_init(struct drm_device *dev, int flags)
return ret;
}
- /* Updated edid for set_vbe_mode_info_valid */
+ /* Updated edid for fb_fill_framebuffer_info */
edid.x_resolution = edid.mode.ha;
edid.y_resolution = edid.mode.va;
edid.framebuffer_bits_per_pixel = format.cpp[0] * 8;
@@ -227,7 +228,7 @@ int ast_driver_framebuffer_init(struct drm_device *dev, int flags)
ast_hide_cursor(&crtc);
/* Advertise new mode */
- set_vbe_mode_info_valid(&edid, fb.mmio_addr);
+ fb_new_framebuffer_info_from_edid(&edid, fb.mmio_addr);
/* Clear display */
memset((void *)(uintptr_t)fb.mmio_addr, 0, edid.bytes_per_line * edid.y_resolution);
diff --git a/src/drivers/emulation/qemu/bochs.c b/src/drivers/emulation/qemu/bochs.c
index 5a6603ee1e..73fa19e2ca 100644
--- a/src/drivers/emulation/qemu/bochs.c
+++ b/src/drivers/emulation/qemu/bochs.c
@@ -1,7 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <stdint.h>
-#include <edid.h>
#include <arch/io.h>
#include <console/console.h>
#include <device/device.h>
@@ -10,6 +9,7 @@
#include <device/pci_ids.h>
#include <pc80/vga.h>
#include <pc80/vga_io.h>
+#include <framebuffer_info.h>
/* VGA init. We use the Bochs VESA VBE extensions */
#define VBE_DISPI_IOPORT_INDEX 0x01CE
@@ -82,7 +82,6 @@ static struct resource res_legacy = {
static void bochs_init_linear_fb(struct device *dev)
{
- struct edid edid;
struct resource *res_fb, *res_io;
int id, mem, bar;
@@ -139,13 +138,8 @@ static void bochs_init_linear_fb(struct device *dev)
bochs_vga_write(res_io, 0, 0x20); /* disable blanking */
- /* setup coreboot framebuffer */
- edid.mode.ha = width;
- edid.mode.va = height;
- edid.panel_bits_per_color = 8;
- edid.panel_bits_per_pixel = 24;
- edid_set_framebuffer_bits_per_pixel(&edid, 32, 0);
- set_vbe_mode_info_valid(&edid, res_fb->base);
+ /* Advertise new mode */
+ fb_add_framebuffer_info(res_fb->base, width, height, 4 * width, 32);
}
static void bochs_init_text_mode(struct device *dev)
diff --git a/src/drivers/emulation/qemu/cirrus.c b/src/drivers/emulation/qemu/cirrus.c
index d63f490603..d9e0e1bd14 100644
--- a/src/drivers/emulation/qemu/cirrus.c
+++ b/src/drivers/emulation/qemu/cirrus.c
@@ -1,13 +1,13 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include <stdint.h>
-#include <edid.h>
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_ops.h>
#include <pc80/vga.h>
#include <pc80/vga_io.h>
+#include <framebuffer_info.h>
static int width = CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_XRES;
static int height = CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_YRES;
@@ -299,13 +299,7 @@ static void cirrus_init_linear_fb(struct device *dev)
vga_sr_write (CIRRUS_SR_EXTENDED_MODE, sr_ext);
write_hidden_dac (hidden_dac);
- struct edid edid;
- edid.mode.ha = width;
- edid.mode.va = height;
- edid.panel_bits_per_color = 8;
- edid.panel_bits_per_pixel = 24;
- edid_set_framebuffer_bits_per_pixel(&edid, 32, 0);
- set_vbe_mode_info_valid(&edid, addr);
+ fb_add_framebuffer_info(addr, width, height, 4 * width, 32);
}
static void cirrus_init_text_mode(struct device *dev)
diff --git a/src/include/edid.h b/src/include/edid.h
index 3644e6ab2a..691cf76b97 100644
--- a/src/include/edid.h
+++ b/src/include/edid.h
@@ -96,8 +96,6 @@ enum edid_status {
int decode_edid(unsigned char *edid, int size, struct edid *out);
void edid_set_framebuffer_bits_per_pixel(struct edid *edid, int fb_bpp,
int row_byte_alignment);
-struct fb_info *set_vbe_mode_info_valid(const struct edid *edid, uintptr_t fb_addr);
-void set_vbe_framebuffer_orientation(enum lb_fb_orientation orientation);
int set_display_mode(struct edid *edid, enum edid_modes mode);
#endif /* EDID_H */
diff --git a/src/include/framebuffer_info.h b/src/include/framebuffer_info.h
index 5251f2901a..07ddd31ce8 100644
--- a/src/include/framebuffer_info.h
+++ b/src/include/framebuffer_info.h
@@ -19,4 +19,8 @@ struct fb_info *fb_add_framebuffer_info(uintptr_t fb_addr, uint32_t x_resolution
void fb_set_orientation(struct fb_info *info,
enum lb_fb_orientation orientation);
+struct edid;
+struct fb_info *fb_new_framebuffer_info_from_edid(const struct edid *edid,
+ uintptr_t fb_addr);
+
#endif /* __FRAMEBUFFER_INFO_H_ */
diff --git a/src/lib/edid_fill_fb.c b/src/lib/edid_fill_fb.c
index 1e8cc5a5e7..712cd0f525 100644
--- a/src/lib/edid_fill_fb.c
+++ b/src/lib/edid_fill_fb.c
@@ -153,7 +153,8 @@ void fb_set_orientation(struct fb_info *info, enum lb_fb_orientation orientation
/*
* Take an edid, and create a framebuffer.
*/
-struct fb_info *set_vbe_mode_info_valid(const struct edid *edid, uintptr_t fb_addr)
+struct fb_info *fb_new_framebuffer_info_from_edid(const struct edid *edid,
+ uintptr_t fb_addr)
{
return fb_add_framebuffer_info(fb_addr, edid->x_resolution, edid->y_resolution,
edid->bytes_per_line, edid->framebuffer_bits_per_pixel);
diff --git a/src/mainboard/emulation/qemu-armv7/mainboard.c b/src/mainboard/emulation/qemu-armv7/mainboard.c
index 977725d246..c3d974c429 100644
--- a/src/mainboard/emulation/qemu-armv7/mainboard.c
+++ b/src/mainboard/emulation/qemu-armv7/mainboard.c
@@ -4,15 +4,14 @@
#include <device/device.h>
#include <cbmem.h>
#include <halt.h>
-#include <edid.h>
#include <device/mmio.h>
#include <ramdetect.h>
#include <symbols.h>
+#include <framebuffer_info.h>
static void init_gfx(void)
{
uint32_t *pl111;
- struct edid edid;
/* width is at most 4096 */
/* height is at most 1024 */
int width = 800, height = 600;
@@ -28,12 +27,7 @@ static void init_gfx(void)
write32(pl111 + 10, 0xff);
write32(pl111 + 6, (5 << 1) | 0x801);
- edid.framebuffer_bits_per_pixel = 32;
- edid.bytes_per_line = width * 4;
- edid.x_resolution = width;
- edid.y_resolution = height;
-
- set_vbe_mode_info_valid(&edid, framebuffer);
+ fb_add_framebuffer_info(framebuffer, width, height, 4 * width, 32);
}
static void mainboard_enable(struct device *dev)
diff --git a/src/mainboard/google/asurada/mainboard.c b/src/mainboard/google/asurada/mainboard.c
index 8e7f2e8480..f836724df6 100644
--- a/src/mainboard/google/asurada/mainboard.c
+++ b/src/mainboard/google/asurada/mainboard.c
@@ -8,6 +8,7 @@
#include <device/mmio.h>
#include <drivers/analogix/anx7625/anx7625.h>
#include <edid.h>
+#include <framebuffer_info.h>
#include <gpio.h>
#include <soc/ddp.h>
#include <soc/dpm.h>
@@ -124,7 +125,7 @@ static bool configure_display(void)
return false;
}
mtk_ddp_mode_set(&edid);
- set_vbe_mode_info_valid(&edid, 0);
+ fb_new_framebuffer_info_from_edid(&edid, (uintptr_t)0);
return true;
}
diff --git a/src/mainboard/google/daisy/mainboard.c b/src/mainboard/google/daisy/mainboard.c
index 2f07937475..1df786db83 100644
--- a/src/mainboard/google/daisy/mainboard.c
+++ b/src/mainboard/google/daisy/mainboard.c
@@ -7,7 +7,6 @@
#include <device/device.h>
#include <device/i2c_simple.h>
#include <drivers/ti/tps65090/tps65090.h>
-#include <edid.h>
#include <soc/clk.h>
#include <soc/dp.h>
#include <soc/dp-core.h>
@@ -18,6 +17,7 @@
#include <soc/tmu.h>
#include <soc/usb.h>
#include <symbols.h>
+#include <framebuffer_info.h>
#include "exynos5250.h"
@@ -28,15 +28,6 @@
#define DRAM_SIZE CONFIG_DRAM_SIZE_MB
#define DRAM_END (DRAM_START + DRAM_SIZE) /* plus one... */
-static struct edid edid = {
- .mode.ha = 1366,
- .mode.va = 768,
- .framebuffer_bits_per_pixel = 16,
- .x_resolution = 1366,
- .y_resolution = 768,
- .bytes_per_line = 2 * 1366
-};
-
/* TODO: transplanted DP stuff, clean up once we have something that works */
static enum exynos5_gpio_pin dp_pd_l = GPIO_Y25; /* active low */
static enum exynos5_gpio_pin dp_rst_l = GPIO_X15; /* active low */
@@ -263,7 +254,7 @@ static void mainboard_init(struct device *dev)
sdmmc_vdd();
- set_vbe_mode_info_valid(&edid, (uintptr_t)fb_addr);
+ fb_add_framebuffer_info((uintptr_t)fb_addr, 1366, 768, 2 * 1366, 16);
lcd_vdd();
diff --git a/src/mainboard/google/kukui/mainboard.c b/src/mainboard/google/kukui/mainboard.c
index 216b6f43e4..a197a7f009 100644
--- a/src/mainboard/google/kukui/mainboard.c
+++ b/src/mainboard/google/kukui/mainboard.c
@@ -169,7 +169,7 @@ static bool configure_display(void)
return false;
}
mtk_ddp_mode_set(edid);
- struct fb_info *info = set_vbe_mode_info_valid(edid, 0);
+ struct fb_info *info = fb_new_framebuffer_info_from_edid(edid, 0);
if (info)
fb_set_orientation(info, panel->s->orientation);
diff --git a/src/mainboard/google/oak/mainboard.c b/src/mainboard/google/oak/mainboard.c
index e89bc6bf21..cd17edebe1 100644
--- a/src/mainboard/google/oak/mainboard.c
+++ b/src/mainboard/google/oak/mainboard.c
@@ -18,6 +18,7 @@
#include <soc/pll.h>
#include <soc/usb.h>
#include <vendorcode/google/chromeos/chromeos.h>
+#include <framebuffer_info.h>
enum {
CODEC_I2C_BUS = 0,
@@ -224,7 +225,7 @@ static void display_startup(void)
}
mtk_ddp_mode_set(&edid);
- set_vbe_mode_info_valid(&edid, (uintptr_t)0);
+ fb_new_framebuffer_info_from_edid(&edid, (uintptr_t)0);
}
static void mainboard_init(struct device *dev)
diff --git a/src/mainboard/google/peach_pit/mainboard.c b/src/mainboard/google/peach_pit/mainboard.c
index 85c0407e81..ab3c0f5b35 100644
--- a/src/mainboard/google/peach_pit/mainboard.c
+++ b/src/mainboard/google/peach_pit/mainboard.c
@@ -9,7 +9,6 @@
#include <device/i2c_simple.h>
#include <drivers/parade/ps8625/ps8625.h>
#include <ec/google/chromeec/ec.h>
-#include <edid.h>
#include <soc/tmu.h>
#include <soc/clk.h>
#include <soc/cpu.h>
@@ -23,20 +22,12 @@
#include <string.h>
#include <symbols.h>
#include <vbe.h>
+#include <framebuffer_info.h>
/* convenient shorthand (in MB) */
#define DRAM_START ((uintptr_t)_dram/MiB)
#define DRAM_SIZE CONFIG_DRAM_SIZE_MB
-static struct edid edid = {
- .mode.ha = 1366,
- .mode.va = 768,
- .framebuffer_bits_per_pixel = 16,
- .x_resolution = 1366,
- .y_resolution = 768,
- .bytes_per_line = 2 * 1366
-};
-
/* from the fdt */
static struct vidinfo vidinfo = {
.vl_freq = 60,
@@ -402,7 +393,7 @@ static void mainboard_init(struct device *dev)
sdmmc_vdd();
- set_vbe_mode_info_valid(&edid, (uintptr_t)fb_addr);
+ fb_add_framebuffer_info((uintptr_t)fb_addr, 1366, 768, 2 * 1366, 16);
/*
* The reset value for FIMD SYSMMU register MMU_CTRL:0x14640000
diff --git a/src/mainboard/google/trogdor/mainboard.c b/src/mainboard/google/trogdor/mainboard.c
index 54d8b0dd5c..0f469e065b 100644
--- a/src/mainboard/google/trogdor/mainboard.c
+++ b/src/mainboard/google/trogdor/mainboard.c
@@ -6,6 +6,7 @@
#include <device/device.h>
#include <device/i2c_simple.h>
#include <drivers/ti/sn65dsi86bridge/sn65dsi86bridge.h>
+#include <framebuffer_info.h>
#include <soc/display/mipi_dsi.h>
#include <soc/display/mdssreg.h>
#include <soc/qupv3_config.h>
@@ -105,7 +106,7 @@ static void display_startup(void)
/* Configure backlight */
gpio_output(GPIO_BACKLIGHT_ENABLE, 1);
display_init(&ed);
- set_vbe_mode_info_valid(&ed, (uintptr_t)0);
+ fb_new_framebuffer_info_from_edid(&ed, (uintptr_t)0);
} else
printk(BIOS_INFO, "Skipping display init.\n");
}
diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
index 118d02c32c..b396effd1c 100644
--- a/src/northbridge/intel/i945/gma.c
+++ b/src/northbridge/intel/i945/gma.c
@@ -19,6 +19,7 @@
#include <pc80/vga_io.h>
#include <commonlib/helpers.h>
#include <types.h>
+#include <framebuffer_info.h>
#include "i945.h"
#include "chip.h"
@@ -358,7 +359,7 @@ static int intel_gma_init_lvds(struct northbridge_intel_i945_config *conf,
(void *)pgfx, hactive * vactive * 4);
memset((void *)pgfx, 0x00, hactive * vactive * 4);
- set_vbe_mode_info_valid(&edid, pgfx);
+ fb_new_framebuffer_info_from_edid(&edid, pgfx);
} else {
vga_misc_write(0x67);
diff --git a/src/soc/nvidia/tegra124/display.c b/src/soc/nvidia/tegra124/display.c
index 485e032c19..5935d0d169 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 8625f76a8c..0c54f7a304 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);
}
diff --git a/src/soc/rockchip/rk3288/display.c b/src/soc/rockchip/rk3288/display.c
index fd86b95d68..19a75de1fd 100644
--- a/src/soc/rockchip/rk3288/display.c
+++ b/src/soc/rockchip/rk3288/display.c
@@ -17,6 +17,7 @@
#include <soc/grf.h>
#include <soc/soc.h>
#include <soc/vop.h>
+#include <framebuffer_info.h>
#include "chip.h"
@@ -124,5 +125,5 @@ void rk_display_init(struct device *dev, u32 lcdbase, unsigned long fb_size)
break;
}
- set_vbe_mode_info_valid(&edid, (uintptr_t)lcdbase);
+ fb_new_framebuffer_info_from_edid(&edid, (uintptr_t)lcdbase);
}
diff --git a/src/soc/rockchip/rk3399/display.c b/src/soc/rockchip/rk3399/display.c
index 70e8c7c15d..1d263ef5dc 100644
--- a/src/soc/rockchip/rk3399/display.c
+++ b/src/soc/rockchip/rk3399/display.c
@@ -18,6 +18,7 @@
#include <soc/mipi.h>
#include <soc/soc.h>
#include <soc/vop.h>
+#include <framebuffer_info.h>
#include "chip.h"
@@ -160,7 +161,7 @@ retry_edp:
break;
}
mainboard_power_on_backlight();
- set_vbe_mode_info_valid(&edid, (uintptr_t)0);
+ fb_new_framebuffer_info_from_edid(&edid, (uintptr_t)0);
return;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 22:09:33 +0000