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

nb/intel/haswell/gma: Use common init_igd_opregion method

Browse Source 
Use common init_igd_opregion method and remove duplicated code in
acpi.c.

Change-Id: I811e8bd2be68813321dc4581af02e1c21b0da076
Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-on: https://review.coreboot.org/19910
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Patrick Rudolph
2017-05-20 11:49:22 +02:00
committed by Nico Huber
parent ee14ccca7a
commit 9aca643ccb
4 changed files with 19 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/northbridge/intel/haswell/gma.c
View File

@@ -23,6 +23,7 @@
#include <drivers/intel/gma/i915_reg.h>
#include <drivers/intel/gma/i915.h>
#include <cpu/intel/haswell/haswell.h>
#include <northbridge/intel/common/gma_opregion.h>
#include <stdlib.h>
#include <string.h>
@@ -493,6 +494,20 @@ static void gma_ssdt(device_t device)
drivers_intel_gma_displays_ssdt_generate(gfx);
}
/* Enable SCI to ACPI _GPE._L06 */
static void gma_enable_swsci(void)
{
u16 reg16;
/* clear DMISCI status */
reg16 = inw(get_pmbase() + TCO1_STS);
reg16 &= DMISCI_STS;
outw(get_pmbase() + TCO1_STS, reg16);
/* clear and enable ACPI TCO SCI */
enable_tco_sci();
}
static unsigned long
gma_write_acpi_tables(struct device *const dev,
unsigned long current,
@@ -500,11 +515,13 @@ gma_write_acpi_tables(struct device *const dev,
{
igd_opregion_t *opregion = (igd_opregion_t *)current;
if (init_igd_opregion(opregion))
if (init_igd_opregion(opregion) != CB_SUCCESS)
return current;
current += sizeof(igd_opregion_t);
gma_enable_swsci();
current = acpi_align_current(current);
return current;
}