diff options
Diffstat (limited to 'src/northbridge/intel/i945/gma.c')
| -rw-r--r-- | src/northbridge/intel/i945/gma.c | 46 |
1 files changed, 2 insertions, 44 deletions
diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c index dfdd2fa34e..181aee56e7 100644 --- a/src/northbridge/intel/i945/gma.c +++ b/src/northbridge/intel/i945/gma.c @@ -18,8 +18,6 @@ #include <pc80/vga.h> #include <pc80/vga_io.h> #include <commonlib/helpers.h> -#include <cbmem.h> -#include <southbridge/intel/i82801gx/nvs.h> #include <types.h> #include "i945.h" @@ -43,19 +41,6 @@ #define DEFAULT_BLC_PWM 180 -uintptr_t gma_get_gnvs_aslb(const void *gnvs) -{ - const global_nvs_t *gnvs_ptr = gnvs; - return (uintptr_t)(gnvs_ptr ? gnvs_ptr->aslb : 0); -} - -void gma_set_gnvs_aslb(void *gnvs, uintptr_t aslb) -{ - global_nvs_t *gnvs_ptr = gnvs; - if (gnvs_ptr) - gnvs_ptr->aslb = aslb; -} - static int gtt_setup(u8 *mmiobase) { unsigned long PGETBL_save; @@ -677,6 +662,8 @@ static void gma_func0_init(struct device *dev) { u32 reg32; + intel_gma_init_igd_opregion(); + /* Unconditionally reset graphics */ pci_write_config8(dev, GDRST, 1); udelay(50); @@ -707,8 +694,6 @@ static void gma_func0_init(struct device *dev) /* PCI Init, will run VBIOS */ pci_dev_init(dev); } - - intel_gma_restore_opregion(); } /* This doesn't reclaim stolen UMA memory, but IGD could still @@ -763,32 +748,6 @@ static void gma_func0_read_resources(struct device *dev) pci_dev_read_resources(dev); } -static unsigned long -gma_write_acpi_tables(const struct device *const dev, - unsigned long current, - struct acpi_rsdp *const rsdp) -{ - igd_opregion_t *opregion = (igd_opregion_t *)current; - global_nvs_t *gnvs; - - if (intel_gma_init_igd_opregion(opregion) != CB_SUCCESS) - return current; - - current += sizeof(igd_opregion_t); - - /* GNVS has been already set up */ - gnvs = cbmem_find(CBMEM_ID_ACPI_GNVS); - if (gnvs) { - /* IGD OpRegion Base Address */ - gma_set_gnvs_aslb(gnvs, (uintptr_t)opregion); - } else { - printk(BIOS_ERR, "Error: GNVS table not found.\n"); - } - - current = acpi_align_current(current); - return current; -} - static const char *gma_acpi_name(const struct device *dev) { return "GFX0"; @@ -807,7 +766,6 @@ static struct device_operations gma_func0_ops = { .disable = gma_func0_disable, .ops_pci = &gma_pci_ops, .acpi_name = gma_acpi_name, - .write_acpi_tables = gma_write_acpi_tables, }; |