[coreboot-gerrit] New patch to review for coreboot: 85ba33d NOTFORMERGE: i945: permanently set tft_brightness to 0xff

[Francis Rowe (info@gluglug.org.uk)]

Francis Rowe (info at gluglug.org.uk) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7561

-gerrit

commit 85ba33d68505a0934e49f6fff0acb611fd09ec89
Author: Francis Rowe <info at gluglug.org.uk>
Date:   Sun Nov 23 06:19:48 2014 +0000

    NOTFORMERGE: i945: permanently set tft_brightness to 0xff
    
    Change-Id: I33c15b5b6f8ab180c1cc83fdcdc2f48930bdd829
    Signed-off-by: Francis Rowe <info at gluglug.org.uk>
---
 src/mainboard/lenovo/x60/smihandler.c | 5 +++--
 src/northbridge/intel/i945/gma.c      | 7 ++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/mainboard/lenovo/x60/smihandler.c b/src/mainboard/lenovo/x60/smihandler.c
index 090f037..6dc95f2 100644
--- a/src/mainboard/lenovo/x60/smihandler.c
+++ b/src/mainboard/lenovo/x60/smihandler.c
@@ -51,8 +51,9 @@ static void mainboard_smi_save_cmos(void)
 	tmp70 = inb(0x70);
 	tmp72 = inb(0x72);
 
-	val = pci_read_config8(PCI_DEV(0, 2, 1), 0xf4);
-	set_option("tft_brightness", &val);
+	/* Permanently set tft_brightness to 0xff. Ignore nvramtool config. */
+	set_option("tft_brightness", 0xff);
+
 	val = ec_read(H8_VOLUME_CONTROL);
 	set_option("volume", &val);
 
diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
index 204ba01..d10cbf6 100644
--- a/src/northbridge/intel/i945/gma.c
+++ b/src/northbridge/intel/i945/gma.c
@@ -471,17 +471,14 @@ 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);
 
-	if (get_option(&val, "tft_brightness") == CB_SUCCESS)
-		pci_write_config8(dev, 0xf4, val);
-	else
-		pci_write_config8(dev, 0xf4, 0xff);
+	/* Permanently set tft_brightness to 0xff. Ignore nvramtool configuration */
+	pci_write_config8(dev, 0xf4, 0xff);
 }
 
 static void gma_set_subsystem(device_t dev, unsigned vendor, unsigned device)