Vladimir Serbinenko (phcoder@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5147
-gerrit
commit 252f844bcdf6d2aedb5872dffd646032d6f81788 Author: Vladimir Serbinenko phcoder@gmail.com Date: Wed Feb 5 21:35:17 2014 +0100
nehalem,sandy,ivy,haswell: Hardwire MARK_GRAPHICS_MEM_WRCOMB to 1.
This config has effect only on mentioned northbridges. It should be enabled on all systems that work with it. board-status and tests on x201 and x230 indicate that this config works on all systems from the list (not tested on stout and ktqm77 but no reason for it not to work.
Change-Id: I6ddff746b50b51a1fee0a1923c18b016861ab013 Signed-off-by: Vladimir Serbinenko phcoder@gmail.com --- src/arch/x86/Kconfig | 8 -------- src/mainboard/google/bolt/Kconfig | 1 - src/mainboard/google/falco/Kconfig | 1 - src/mainboard/google/link/Kconfig | 1 - src/mainboard/google/peppy/Kconfig | 1 - src/mainboard/google/rambi/Kconfig | 1 - src/mainboard/google/slippy/Kconfig | 1 - src/mainboard/intel/wtm2/Kconfig | 1 - src/northbridge/intel/haswell/gma.c | 6 ++---- src/northbridge/intel/nehalem/gma.c | 2 -- src/northbridge/intel/sandybridge/gma.c | 6 ++---- 11 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index 0a21fcc..8854e6b 100644 --- a/src/arch/x86/Kconfig +++ b/src/arch/x86/Kconfig @@ -7,14 +7,6 @@ config X86_ARCH_OPTIONS select HAVE_ARCH_MEMCPY select HAVE_ARCH_MEMMOVE
-config MARK_GRAPHICS_MEM_WRCOMB - bool "Mark graphics memory as write-combining." - default n - help - The graphics performance may increase if the graphics - memory is set as write-combining cache type. This option - enables marking the graphics memory as write-combining. - # This is an SMP option. It relates to starting up APs. # It is usually set in mainboard/*/Kconfig. # TODO: Improve description. diff --git a/src/mainboard/google/bolt/Kconfig b/src/mainboard/google/bolt/Kconfig index 3004443..47d41ed 100644 --- a/src/mainboard/google/bolt/Kconfig +++ b/src/mainboard/google/bolt/Kconfig @@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS select EXTERNAL_MRC_BLOB - select MARK_GRAPHICS_MEM_WRCOMB select MONOTONIC_TIMER_MSR
config VBOOT_RAMSTAGE_INDEX diff --git a/src/mainboard/google/falco/Kconfig b/src/mainboard/google/falco/Kconfig index 893c4e5..5d19ffc 100644 --- a/src/mainboard/google/falco/Kconfig +++ b/src/mainboard/google/falco/Kconfig @@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS select EXTERNAL_MRC_BLOB - select MARK_GRAPHICS_MEM_WRCOMB select MONOTONIC_TIMER_MSR select DRIVERS_I2C_RTD2132
diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig index d1e809e..efe9519 100644 --- a/src/mainboard/google/link/Kconfig +++ b/src/mainboard/google/link/Kconfig @@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SERIRQ_CONTINUOUS_MODE select MAINBOARD_HAS_NATIVE_VGA_INIT select EARLY_CBMEM_INIT - select MARK_GRAPHICS_MEM_WRCOMB
config MAINBOARD_DIR string diff --git a/src/mainboard/google/peppy/Kconfig b/src/mainboard/google/peppy/Kconfig index 59fb8c0..f401feb 100644 --- a/src/mainboard/google/peppy/Kconfig +++ b/src/mainboard/google/peppy/Kconfig @@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS select EXTERNAL_MRC_BLOB - select MARK_GRAPHICS_MEM_WRCOMB select MONOTONIC_TIMER_MSR
config VBOOT_RAMSTAGE_INDEX diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig index 4d149c9..292d321 100644 --- a/src/mainboard/google/rambi/Kconfig +++ b/src/mainboard/google/rambi/Kconfig @@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS select HAVE_ACPI_RESUME select MAINBOARD_HAS_CHROMEOS select CHROMEOS - select MARK_GRAPHICS_MEM_WRCOMB
config MAINBOARD_DIR string diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig index 3ffacde..ba6a6fe 100644 --- a/src/mainboard/google/slippy/Kconfig +++ b/src/mainboard/google/slippy/Kconfig @@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS select EXTERNAL_MRC_BLOB - select MARK_GRAPHICS_MEM_WRCOMB select MONOTONIC_TIMER_MSR select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_DO_NATIVE_VGA_INIT diff --git a/src/mainboard/intel/wtm2/Kconfig b/src/mainboard/intel/wtm2/Kconfig index 7ff66ed..00ea604 100644 --- a/src/mainboard/intel/wtm2/Kconfig +++ b/src/mainboard/intel/wtm2/Kconfig @@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_RESUME select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS - select MARK_GRAPHICS_MEM_WRCOMB select MAINBOARD_HAS_NATIVE_VGA_INIT select MONOTONIC_TIMER_MSR
diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c index 00d7583..f9387d5 100644 --- a/src/northbridge/intel/haswell/gma.c +++ b/src/northbridge/intel/haswell/gma.c @@ -431,11 +431,10 @@ static void gma_set_subsystem(device_t dev, unsigned vendor, unsigned device)
static void gma_read_resources(struct device *dev) { - pci_dev_read_resources(dev); - -#if CONFIG_MARK_GRAPHICS_MEM_WRCOMB struct resource *res;
+ pci_dev_read_resources(dev); + /* Set the graphics memory to write combining. */ res = find_resource(dev, PCI_BASE_ADDRESS_2); if (res == NULL) { @@ -443,7 +442,6 @@ static void gma_read_resources(struct device *dev) return; } res->flags |= IORESOURCE_WRCOMB; -#endif }
static struct pci_operations gma_pci_ops = { diff --git a/src/northbridge/intel/nehalem/gma.c b/src/northbridge/intel/nehalem/gma.c index c7a0e9b..f06e83f 100644 --- a/src/northbridge/intel/nehalem/gma.c +++ b/src/northbridge/intel/nehalem/gma.c @@ -703,9 +703,7 @@ static void gma_read_resources(struct device *dev) 0xd0000001); pci_write_config32(dev, PCI_BASE_ADDRESS_2 + 4, 0); -#if CONFIG_MARK_GRAPHICS_MEM_WRCOMB res->flags |= IORESOURCE_WRCOMB; -#endif res->base = (resource_t) 0xd0000000; res->size = (resource_t) 0x10000000; } diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c index 853139e..0d4eb11 100644 --- a/src/northbridge/intel/sandybridge/gma.c +++ b/src/northbridge/intel/sandybridge/gma.c @@ -666,11 +666,10 @@ static void gma_set_subsystem(device_t dev, unsigned vendor, unsigned device)
static void gma_read_resources(struct device *dev) { - pci_dev_read_resources(dev); - -#if CONFIG_MARK_GRAPHICS_MEM_WRCOMB struct resource *res;
+ pci_dev_read_resources(dev); + /* Set the graphics memory to write combining. */ res = find_resource(dev, PCI_BASE_ADDRESS_2); if (res == NULL) { @@ -678,7 +677,6 @@ static void gma_read_resources(struct device *dev) return; } res->flags |= IORESOURCE_WRCOMB; -#endif }
static struct pci_operations gma_pci_ops = {