[coreboot-gerrit] Patch set updated for coreboot: c664279 northbride/i945/gma: revert patch that hardcodes tft_brightness

[Francis Rowe]

Francis Rowe ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8697

-gerrit

commit c66427992163c61c381fab4c9fd74e1feb877546
Author: Francis Rowe 
Date:   Mon Mar 16 07:06:30 2015 +0000

northbride/i945/gma: revert patch that hardcodes tft_brightness

It was an accident.

Change-Id: Ib421d33da7e853f509e9e58fad864fb8a36526de
    Signed-off-by: Francis Rowe 
---
 src/northbridge/intel/i945/gma.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
index cee0640..d556a06 100644
--- a/src/northbridge/intel/i945/gma.c
+++ b/src/northbridge/intel/i945/gma.c
@@ -472,14 +472,17 @@ static void gma_func0_disable(struct device *dev)
 static void gma_func1_init(struct device *dev)
 {
    u32 reg32;
+	u8 val;

/* IGD needs to be Bus Master, also enable IO accesss */
    reg32 = pci_read_config32(dev, PCI_COMMAND);
    pci_write_config32(dev, PCI_COMMAND, reg32 |
    		PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY | PCI_COMMAND_IO);

-	/* Permanently set tft_brightness to 0xff. Ignore nvramtool configuration */
-	pci_write_config8(dev, 0xf4, 0xff);
+	if (get_option(&val, "tft_brightness") == CB_SUCCESS)
+		pci_write_config8(dev, 0xf4, val);
+	else
+		pci_write_config8(dev, 0xf4, 0xff);
 }

static void gma_set_subsystem(device_t dev, unsigned vendor, unsigned device)