nb/intel/sandybridge/gma: Fix S3 resume
The S3 resume path is broken on current Linux (4.11.3) and maybe on older kernel, too. Don't run the native graphics init when on S3 resume to fix it. Tested on Lenovo T430. Change-Id: Ifad145c86c2e8f019c507f97c889b70b7aa49882 Signed-off-by: Patrick Rudolph <siro@das-labor.org> Reviewed-on: https://review.coreboot.org/20289 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
parent
6037b200d1
commit
de4a1a0909
|
@ -630,8 +630,10 @@ static void gma_func0_init(struct device *dev)
|
||||||
/* Post VBIOS init */
|
/* Post VBIOS init */
|
||||||
gma_pm_init_post_vbios(dev);
|
gma_pm_init_post_vbios(dev);
|
||||||
|
|
||||||
if (IS_ENABLED(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) ||
|
/* Running graphics init on S3 breaks Linux drm driver. */
|
||||||
IS_ENABLED(CONFIG_MAINBOARD_USE_LIBGFXINIT)) {
|
if (!acpi_is_wakeup_s3() &&
|
||||||
|
(IS_ENABLED(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) ||
|
||||||
|
IS_ENABLED(CONFIG_MAINBOARD_USE_LIBGFXINIT))) {
|
||||||
/* This should probably run before post VBIOS init. */
|
/* This should probably run before post VBIOS init. */
|
||||||
printk(BIOS_SPEW, "Initializing VGA without OPROM.\n");
|
printk(BIOS_SPEW, "Initializing VGA without OPROM.\n");
|
||||||
u8 *mmiobase;
|
u8 *mmiobase;
|
||||||
|
|
Loading…
Reference in New Issue