northbridge/i945/gma: Re-enable NVRAM tft_brightness
Commit 71512b2c (northbridge/i945/gma: fix build error with native graphics init)
unintentionally changed the code to ignore the NVRAM setting
`tft_brightness`. Revert that hunk to restore the original behavior.
Change-Id: Iffdfc5272732bad3476f35ddac1f5a7564270531
Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
Reviewed-on: https://review.coreboot.org/14002
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
			
			
This commit is contained in:
		
				
					committed by
					
						 Martin Roth
						Martin Roth
					
				
			
			
				
	
			
			
			
						parent
						
							a2176d8ef6
						
					
				
				
					commit
					c7a1a3e994
				
			| @@ -465,14 +465,17 @@ static void gma_func0_disable(struct device *dev) | |||||||
| static void gma_func1_init(struct device *dev) | static void gma_func1_init(struct device *dev) | ||||||
| { | { | ||||||
| 	u32 reg32; | 	u32 reg32; | ||||||
|  | 	u8 val; | ||||||
|  |  | ||||||
| 	/* IGD needs to be Bus Master, also enable IO accesss */ | 	/* IGD needs to be Bus Master, also enable IO accesss */ | ||||||
| 	reg32 = pci_read_config32(dev, PCI_COMMAND); | 	reg32 = pci_read_config32(dev, PCI_COMMAND); | ||||||
| 	pci_write_config32(dev, PCI_COMMAND, reg32 | | 	pci_write_config32(dev, PCI_COMMAND, reg32 | | ||||||
| 			PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY | PCI_COMMAND_IO); | 			PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY | PCI_COMMAND_IO); | ||||||
|  |  | ||||||
| 	/* Permanently set tft_brightness to 0xff. Ignore nvramtool configuration */ | 	if (get_option(&val, "tft_brightness") == CB_SUCCESS) | ||||||
| 	pci_write_config8(dev, 0xf4, 0xff); | 		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) | static void gma_set_subsystem(device_t dev, unsigned vendor, unsigned device) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user