summaryrefslogtreecommitdiff
path: root/drivers/gpu/vga
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2014-05-19 14:04:43 -0400
committerAlex Deucher <alexander.deucher@amd.com>2014-06-02 10:25:08 -0400
commitf2bc561610962693be61425cf913778586d8f9c1 (patch)
tree9241d007c8fc219dd6ad7e3c2faf96cbeae5194e /drivers/gpu/vga
parentd148f9e02e022d503938fc23050a3473f01bdb88 (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
Diffstat (limited to 'drivers/gpu/vga')
-rw-r--r--drivers/gpu/vga/vga_switcheroo.c3
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)
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;
}