GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/skylake: use locate_vbt directly instead of calling a wrapper 

Change-Id: I65c423660ab1778f5dd9243e428a4d005bd1699a
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/21898
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Patrick Georgi 2017-10-05 18:19:29 +02:00
parent 9d3de2649f
commit c6a0050198
3 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/drivers/intel/fsp2_0/graphics.c
View File

@ -94,16 +94,6 @@ enum cb_err fsp_fill_lb_framebuffer(struct lb_framebuffer *framebuffer)
return CB_SUCCESS; return CB_SUCCESS;
} }
uintptr_t fsp_load_vbt(void)
{
void *vbt_data = locate_vbt();
if (vbt_data == NULL)
printk(BIOS_NOTICE, "Could not locate a VBT file in CBFS\n");
return (uintptr_t)vbt_data;
}
int fill_lb_framebuffer(struct lb_framebuffer *framebuffer) int fill_lb_framebuffer(struct lb_framebuffer *framebuffer)
{ {
enum cb_err ret; enum cb_err ret;

7
src/drivers/intel/fsp2_0/include/fsp/util.h
View File

@ -85,13 +85,6 @@ bool fsp_guid_compare(const uint8_t guid1[16], const uint8_t guid2[16]);
enum cb_err fsp_validate_component(struct fsp_header *hdr, enum cb_err fsp_validate_component(struct fsp_header *hdr,
const struct region_device *rdev); const struct region_device *rdev);
/* Load a vbt.bin file for graphics. Returns 0 if a valid VBT is not found. */
#if IS_ENABLED(CONFIG_RUN_FSP_GOP)
uintptr_t fsp_load_vbt(void);
#else
static inline uintptr_t fsp_load_vbt(void) { return 0; }
#endif
/* Get igd framebuffer bar from SoC */ /* Get igd framebuffer bar from SoC */
uintptr_t fsp_soc_get_igd_bar(void); uintptr_t fsp_soc_get_igd_bar(void);

5
src/soc/intel/skylake/chip_fsp20.c
View File

@ -28,6 +28,7 @@
#include <fsp/util.h> #include <fsp/util.h>
#include <romstage_handoff.h> #include <romstage_handoff.h>
#include <soc/acpi.h> #include <soc/acpi.h>
#include <soc/intel/common/vbt.h>
#include <soc/interrupt.h> #include <soc/interrupt.h>
#include <soc/irq.h> #include <soc/irq.h>
#include <soc/pci_devs.h> #include <soc/pci_devs.h>
@ -116,9 +117,9 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd)
/* Load VBT */ /* Load VBT */
if (is_s3_wakeup) { if (is_s3_wakeup) {
printk(BIOS_DEBUG, "S3 resume do not pass VBT to GOP\n"); printk(BIOS_DEBUG, "S3 resume do not pass VBT to GOP\n");
} else if (display_init_required()) { } else if (display_init_required() && IS_ENABLED(CONFIG_RUN_FSP_GOP)) {
/* Get VBT data */ /* Get VBT data */
vbt_data = fsp_load_vbt(); vbt_data = (uintptr_t)locate_vbt();
if (vbt_data) if (vbt_data)
printk(BIOS_DEBUG, "Passing VBT to GOP\n"); printk(BIOS_DEBUG, "Passing VBT to GOP\n");
else else