From: Alex Deucher Date: Mon, 19 May 2014 18:04:43 +0000 (-0400) Subject: vgaswitcheroo: switch the mux to the igp on power down when runpm is enabled X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f2bc561610962693be61425cf913778586d8f9c1;p=linux-beck.git vgaswitcheroo: switch the mux to the igp on power down when runpm is enabled Avoids blank screens on muxed systems when runpm is active. bug: https://bugs.freedesktop.org/show_bug.cgi?id=75917 Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org --- diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c index ec0ae2d1686a..6866448083b2 100644 --- a/drivers/gpu/vga/vga_switcheroo.c +++ b/drivers/gpu/vga/vga_switcheroo.c @@ -623,7 +623,8 @@ static int vga_switcheroo_runtime_suspend(struct device *dev) ret = dev->bus->pm->runtime_suspend(dev); if (ret) return ret; - + if (vgasr_priv.handler->switchto) + vgasr_priv.handler->switchto(VGA_SWITCHEROO_IGD); vga_switcheroo_power_switch(pdev, VGA_SWITCHEROO_OFF); return 0; }