vgaswitcheroo: switch the mux to the igp on power down when runpm is enabled
authorAlex Deucher <alexander.deucher@amd.com>
Mon, 19 May 2014 18:04:43 +0000 (14:04 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 2 Jun 2014 14:25:08 +0000 (10:25 -0400)
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
drivers/gpu/vga/vga_switcheroo.c

index ec0ae2d1686a3150c03403fa42524aca2111afa4..6866448083b2c1d6ad99686c2854db9ad94a5bb7 100644 (file)
@@ -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;
 }