diff options
| author | Matt DeVillier <matt.devillier@gmail.com> | 2018-06-20 00:40:48 -0500 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-12-18 13:28:01 +0000 |
| commit | a9492a6169b4636b93de7c9271dd39a16fcc3a5b (patch) | |
| tree | 65e116df2f36c000d2dc68fdf6879fd69d35ee99 /src/soc | |
| parent | e5a1a4c5d6c55be287bef6bef15f138e86dace3f (diff) | |
soc/braswell: ensure ACPI opregion restored on S3 with GOP init
The Intel GMA ACPI opregion address needs to be set on S3 resume,
otherwise the Windows display driver fails to re-initialize correctly.
Fix by ensuring the address is set correctly regardless of display
init type used (GOP or VBIOS).
Test: build/boot on google/edgar, ensure internal display functional
following S3 resume under Windows 10.
Change-Id: I471c44e8ba4514e4a2ddf6739109b759145598ed
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/30233
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/intel/braswell/Makefile.inc | 3 | ||||
| -rw-r--r-- | src/soc/intel/braswell/gfx.c | 15 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/soc/intel/braswell/Makefile.inc b/src/soc/intel/braswell/Makefile.inc index ac1bacdd0e..fabbc2bc61 100644 --- a/src/soc/intel/braswell/Makefile.inc +++ b/src/soc/intel/braswell/Makefile.inc @@ -22,9 +22,8 @@ ramstage-y += cpu.c ramstage-$(CONFIG_ELOG) += elog.c ramstage-y += emmc.c ramstage-y += gpio.c -ifneq ($(CONFIG_RUN_FSP_GOP),y) ramstage-y += gfx.c -endif + ramstage-y += gpio_support.c ramstage-y += hda.c ramstage-y += iosf.c diff --git a/src/soc/intel/braswell/gfx.c b/src/soc/intel/braswell/gfx.c index 895d2ee7da..9417409358 100644 --- a/src/soc/intel/braswell/gfx.c +++ b/src/soc/intel/braswell/gfx.c @@ -68,15 +68,16 @@ static void gfx_init(struct device *dev) printk(BIOS_SPEW, "%s/%s (%s)\n", __FILE__, __func__, dev_name(dev)); - /* Pre VBIOS Init */ - gfx_pre_vbios_init(dev); + if (!IS_ENABLED(CONFIG_RUN_FSP_GOP)) { + /* Pre VBIOS Init */ + gfx_pre_vbios_init(dev); - /* Run VBIOS */ - pci_dev_init(dev); - - /* Post VBIOS Init */ - gfx_post_vbios_init(dev); + /* Run VBIOS */ + pci_dev_init(dev); + /* Post VBIOS Init */ + gfx_post_vbios_init(dev); + } intel_gma_restore_opregion(); } |