From patchwork Tue May 20 23:16:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 4213361 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0E5399F32A for ; Tue, 20 May 2014 23:16:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 51FA220353 for ; Tue, 20 May 2014 23:16:29 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 71A1320320 for ; Tue, 20 May 2014 23:16:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 758156E843; Tue, 20 May 2014 16:16:27 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qc0-f174.google.com (mail-qc0-f174.google.com [209.85.216.174]) by gabe.freedesktop.org (Postfix) with ESMTP id C350D6E843 for ; Tue, 20 May 2014 16:16:25 -0700 (PDT) Received: by mail-qc0-f174.google.com with SMTP id x13so1914994qcv.33 for ; Tue, 20 May 2014 16:16:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=qx58iL4SNLR5l1/e3P+Abe1FfeA7YagGrNWoGSmQd50=; b=HgIXg2uc+w2+0q4N4sWSF+e4kL8GingvCbB+BL2zw7xt2MI/sZBAHfo7CZx8Mhw0fY +wDXHHUz669cs4oUnCMtx7KsQnxV2RhcIDNkXk6zennwx5xbNl+sAtFw7MWaS6SpUf5k 2Mug+4kbpzoByr8/gJ+A4YFUQi7JiWuIMBfIK5EX8cAGsf8ML24y/lWm4LWtRSFF7r9R YiC6BrlxCXiKYLkF+xaJGg+uZkqrcQHilssmJFKH3xLPk5gle3UaQbHHOhIlFo+98uBK X0MaK0AodGoQ9PU1osN61cOt+UmZxHyn/SZ+mQ5/kFQoSjguUwe53l43tdvURW9fjLbO Ti9w== X-Received: by 10.224.24.134 with SMTP id v6mr27896301qab.88.1400627785197; Tue, 20 May 2014 16:16:25 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by mx.google.com with ESMTPSA id 73sm13719098qgw.5.2014.05.20.16.16.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 May 2014 16:16:24 -0700 (PDT) X-Google-Original-From: Alex Deucher From: Alex Deucher To: dri-devel@lists.freedesktop.org, airlied@gmail.com Subject: [PATCH] vgaswitcheroo: switch the mux to the igp on power down when runpm is enabled Date: Tue, 20 May 2014 19:16:18 -0400 Message-Id: <1400627778-17604-1-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 1.8.3.1 Cc: Alex Deucher , stable@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- drivers/gpu/vga/vga_switcheroo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c index ec0ae2d..6866448 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; }