| From | Greg Kroah-Hartman <> | Subject | [PATCH 3.15 025/122] vgaswitcheroo: switch the mux to the igp on power down when runpm is enabled | Date | Mon, 7 Jul 2014 16:56:27 -0700 |
| |
3.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <alexander.deucher@amd.com>
commit f2bc561610962693be61425cf913778586d8f9c1 upstream.
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 <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- drivers/gpu/vga/vga_switcheroo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/gpu/vga/vga_switcheroo.c +++ b/drivers/gpu/vga/vga_switcheroo.c @@ -623,7 +623,8 @@ static int vga_switcheroo_runtime_suspen 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; }
|