diff options
Diffstat (limited to 'src/northbridge')
| -rw-r--r-- | src/northbridge/intel/gm45/gma.c | 7 | ||||
| -rw-r--r-- | src/northbridge/intel/x4x/gma.c | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c index f0171e6133..606170ce73 100644 --- a/src/northbridge/intel/gm45/gma.c +++ b/src/northbridge/intel/gm45/gma.c @@ -35,6 +35,7 @@ #include <drivers/intel/gma/opregion.h> #include <pc80/vga.h> #include <pc80/vga_io.h> +#include <drivers/intel/gma/libgfxinit.h> #define BASE_FREQUENCY 96000 @@ -770,8 +771,12 @@ static void gma_func0_init(struct device *dev) /* Post VBIOS init */ 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); + } else if (IS_ENABLED(CONFIG_MAINBOARD_USE_LIBGFXINIT)) { + int lightup_ok; + gma_gfxinit(&lightup_ok); + } intel_gma_restore_opregion(); } diff --git a/src/northbridge/intel/x4x/gma.c b/src/northbridge/intel/x4x/gma.c index 6c6f3a2318..f38d64d517 100644 --- a/src/northbridge/intel/x4x/gma.c +++ b/src/northbridge/intel/x4x/gma.c @@ -33,6 +33,7 @@ #include <drivers/intel/gma/edid.h> #include <drivers/intel/gma/i915.h> #include <drivers/intel/gma/opregion.h> +#include <drivers/intel/gma/libgfxinit.h> #include <pc80/vga.h> #include <pc80/vga_io.h> @@ -411,6 +412,9 @@ static void gma_func0_init(struct device *dev) return; } native_init(dev); + } else if (IS_ENABLED(CONFIG_MAINBOARD_USE_LIBGFXINIT)) { + int lightup_ok; + gma_gfxinit(&lightup_ok); } else { pci_dev_init(dev); } |