diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2014-05-19 14:04:43 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2014-06-02 10:25:08 -0400 |
commit | f2bc561610962693be61425cf913778586d8f9c1 (patch) | |
tree | 9241d007c8fc219dd6ad7e3c2faf96cbeae5194e | |
parent | d148f9e02e022d503938fc23050a3473f01bdb88 (diff) |
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 <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
-rw-r--r-- | drivers/gpu/vga/vga_switcheroo.c | 3 |
1 files changed, 2 insertions, 1 deletions
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) | |||
623 | ret = dev->bus->pm->runtime_suspend(dev); | 623 | ret = dev->bus->pm->runtime_suspend(dev); |
624 | if (ret) | 624 | if (ret) |
625 | return ret; | 625 | return ret; |
626 | 626 | if (vgasr_priv.handler->switchto) | |
627 | vgasr_priv.handler->switchto(VGA_SWITCHEROO_IGD); | ||
627 | vga_switcheroo_power_switch(pdev, VGA_SWITCHEROO_OFF); | 628 | vga_switcheroo_power_switch(pdev, VGA_SWITCHEROO_OFF); |
628 | return 0; | 629 | return 0; |
629 | } | 630 | } |