diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-19 07:48:16 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-19 07:48:16 -0400 |
| commit | 3431b392ad50ff37fa3d6e7715c6a99c74d692dc (patch) | |
| tree | 53b6785acaa658a60c6a854af4dea9040f826b48 /lib/efi_loader/efi_gop.c | |
| parent | 68ff827ec74fdca8f17d469f22e1032ed14cb795 (diff) | |
| parent | 3fb97e267a5e136d8386a7cb1d5b4fe63af518eb (diff) | |
Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot
Patch queue for efi - 2016-10-19
Highlights this time around:
- Add run time service (power control) support for PSCI (fixed in v3)
- Add efi gop pointer exposure
- SMBIOS support for EFI (on ARM)
- efi pool memory unmap support (needed for 4.8)
- initial x86 efi payload support (fixed up in v2)
- various bug fixes
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
include/tables_csum.h
Diffstat (limited to 'lib/efi_loader/efi_gop.c')
| -rw-r--r-- | lib/efi_loader/efi_gop.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c index 33a3d717671..286ad830976 100644 --- a/lib/efi_loader/efi_gop.c +++ b/lib/efi_loader/efi_gop.c @@ -129,6 +129,7 @@ int efi_gop_register(void) { struct efi_gop_obj *gopobj; u32 bpix, col, row; + u64 fb_base, fb_size; #ifdef CONFIG_DM_VIDEO struct udevice *vdev; @@ -141,11 +142,16 @@ int efi_gop_register(void) bpix = priv->bpix; col = video_get_xsize(vdev); row = video_get_ysize(vdev); + fb_base = (uintptr_t)priv->fb; + fb_size = priv->fb_size; #else + int line_len; bpix = panel_info.vl_bpix; col = panel_info.vl_col; row = panel_info.vl_row; + fb_base = gd->fb_base; + fb_size = lcd_get_size(&line_len); #endif switch (bpix) { @@ -177,6 +183,16 @@ int efi_gop_register(void) gopobj->mode.info = &gopobj->info; gopobj->mode.info_size = sizeof(gopobj->info); +#ifdef CONFIG_DM_VIDEO + if (bpix == VIDEO_BPP32) { +#else + if (bpix == LCD_COLOR32) { +#endif + /* With 32bit color space we can directly expose the fb */ + gopobj->mode.fb_base = fb_base; + gopobj->mode.fb_size = fb_size; + } + gopobj->info.version = 0; gopobj->info.width = col; gopobj->info.height = row; |