sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/skylake/graphics: Ensure intel_gma_restore_opregion() is called

Browse Source 
Change-Id: If981fa3db12b3a4fe1411f4cce9bac8564697769
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/25466
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
This commit is contained in:
Nico Huber
2018-04-01 01:54:44 +02:00
parent 637bef2037
commit 9d75e87428
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/soc/intel/skylake/graphics.c
View File

@@ -45,6 +45,11 @@ void graphics_soc_init(struct device *dev)
graphics_gtt_write(DDI_BUF_CTL_A, ddi_buf_ctl); graphics_gtt_write(DDI_BUF_CTL_A, ddi_buf_ctl);
} }
/* IGD needs to Bus Master */
u32 reg32 = pci_read_config32(dev, PCI_COMMAND);
reg32 |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY | PCI_COMMAND_IO;
pci_write_config32(dev, PCI_COMMAND, reg32);
/* /*
* GFX PEIM module inside FSP binary is taking care of graphics * GFX PEIM module inside FSP binary is taking care of graphics
* initialization based on RUN_FSP_GOP Kconfig option and input * initialization based on RUN_FSP_GOP Kconfig option and input
@@ -53,15 +58,9 @@ void graphics_soc_init(struct device *dev)
* In case of non-FSP solution, SoC need to select another * In case of non-FSP solution, SoC need to select another
* Kconfig to perform GFX initialization. * Kconfig to perform GFX initialization.
*/ */
if (IS_ENABLED(CONFIG_RUN_FSP_GOP)) if (IS_ENABLED(CONFIG_RUN_FSP_GOP)) {
return; /* nothing to do */
} else if (IS_ENABLED(CONFIG_MAINBOARD_USE_LIBGFXINIT)) {
/* IGD needs to Bus Master */
u32 reg32 = pci_read_config32(dev, PCI_COMMAND);
reg32 |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY | PCI_COMMAND_IO;
pci_write_config32(dev, PCI_COMMAND, reg32);
if (IS_ENABLED(CONFIG_MAINBOARD_USE_LIBGFXINIT)) {
if (!acpi_is_wakeup_s3() && display_init_required()) { if (!acpi_is_wakeup_s3() && display_init_required()) {
int lightup_ok; int lightup_ok;
gma_gfxinit(&lightup_ok); gma_gfxinit(&lightup_ok);