sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libgfxinit: Enable G45 support (for GM45/X4X)

Browse Source 
Change-Id: Ia637d32ffaa5d280320955d34141eddc8b7df981
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/22222
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Nico Huber
2017-10-29 15:42:44 +01:00
committed by Martin Roth
parent b00bac707f
commit f2dd0499b6
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/drivers/intel/gma/Kconfig
View File

@ -65,9 +65,10 @@ config GFX_GMA_ANALOG_I2C_HDMI_D
config GFX_GMA config GFX_GMA
def_bool y def_bool y
depends on NORTHBRIDGE_INTEL_NEHALEM || NORTHBRIDGE_INTEL_SANDYBRIDGE \ depends on NORTHBRIDGE_INTEL_GM45 || NORTHBRIDGE_INTEL_X4X \
|| NORTHBRIDGE_INTEL_IVYBRIDGE || NORTHBRIDGE_INTEL_HASWELL \ || NORTHBRIDGE_INTEL_NEHALEM || NORTHBRIDGE_INTEL_SANDYBRIDGE \
|| SOC_INTEL_BROADWELL || SOC_INTEL_SKYLAKE || NORTHBRIDGE_INTEL_IVYBRIDGE || NORTHBRIDGE_INTEL_HASWELL \
|| SOC_INTEL_BROADWELL || SOC_INTEL_SKYLAKE
depends on MAINBOARD_HAS_LIBGFXINIT depends on MAINBOARD_HAS_LIBGFXINIT
if GFX_GMA if GFX_GMA
@ -80,6 +81,7 @@ config GFX_GMA_CPU
default "Ivybridge" if NORTHBRIDGE_INTEL_IVYBRIDGE default "Ivybridge" if NORTHBRIDGE_INTEL_IVYBRIDGE
default "Sandybridge" if NORTHBRIDGE_INTEL_SANDYBRIDGE default "Sandybridge" if NORTHBRIDGE_INTEL_SANDYBRIDGE
default "Ironlake" if NORTHBRIDGE_INTEL_NEHALEM default "Ironlake" if NORTHBRIDGE_INTEL_NEHALEM
default "G45" if NORTHBRIDGE_INTEL_GM45 || NORTHBRIDGE_INTEL_X4X
config GFX_GMA_CPU_VARIANT config GFX_GMA_CPU_VARIANT
string string
@ -93,6 +95,7 @@ config GFX_GMA_INTERNAL_IS_EDP
config GFX_GMA_INTERNAL_IS_LVDS config GFX_GMA_INTERNAL_IS_LVDS
bool bool
default y if NORTHBRIDGE_INTEL_GM45
default n default n
config GFX_GMA_INTERNAL_PORT config GFX_GMA_INTERNAL_PORT

7
src/northbridge/intel/gm45/gma.c
View File

@ -35,6 +35,7 @@
#include <drivers/intel/gma/opregion.h> #include <drivers/intel/gma/opregion.h>
#include <pc80/vga.h> #include <pc80/vga.h>
#include <pc80/vga_io.h> #include <pc80/vga_io.h>
#include <drivers/intel/gma/libgfxinit.h>
#define BASE_FREQUENCY 96000 #define BASE_FREQUENCY 96000
@ -770,8 +771,12 @@ static void gma_func0_init(struct device *dev)
/* Post VBIOS init */ /* Post VBIOS init */
gma_pm_init_post_vbios(dev, edid_lvds.ascii_string); gma_pm_init_post_vbios(dev, edid_lvds.ascii_string);
if (IS_ENABLED(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT)) if (IS_ENABLED(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT)) {
gma_ngi(dev, &edid_lvds); gma_ngi(dev, &edid_lvds);
} else if (IS_ENABLED(CONFIG_MAINBOARD_USE_LIBGFXINIT)) {
int lightup_ok;
gma_gfxinit(&lightup_ok);
}
intel_gma_restore_opregion(); intel_gma_restore_opregion();
} }

4
src/northbridge/intel/x4x/gma.c
View File

@ -33,6 +33,7 @@
#include <drivers/intel/gma/edid.h> #include <drivers/intel/gma/edid.h>
#include <drivers/intel/gma/i915.h> #include <drivers/intel/gma/i915.h>
#include <drivers/intel/gma/opregion.h> #include <drivers/intel/gma/opregion.h>
#include <drivers/intel/gma/libgfxinit.h>
#include <pc80/vga.h> #include <pc80/vga.h>
#include <pc80/vga_io.h> #include <pc80/vga_io.h>
@ -411,6 +412,9 @@ static void gma_func0_init(struct device *dev)
return; return;
} }
native_init(dev); native_init(dev);
} else if (IS_ENABLED(CONFIG_MAINBOARD_USE_LIBGFXINIT)) {
int lightup_ok;
gma_gfxinit(&lightup_ok);
} else { } else {
pci_dev_init(dev); pci_dev_init(dev);
} }