Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752391AbcCIGOV (ORCPT ); Wed, 9 Mar 2016 01:14:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52652 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751496AbcCIGOK (ORCPT ); Wed, 9 Mar 2016 01:14:10 -0500 From: Dave Airlie To: dri-devel@lists.freedesktop.org, linux-pm@vger.kernel.org, linux-acpi@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] nouveau: use new vga_switcheroo power domain. Date: Wed, 9 Mar 2016 16:14:05 +1000 Message-Id: <1457504045-12738-2-git-send-email-airlied@gmail.com> In-Reply-To: <1457504045-12738-1-git-send-email-airlied@gmail.com> References: <1457504045-12738-1-git-send-email-airlied@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1454 Lines: 40 From: Dave Airlie This fixes GPU auto powerdown on the Lenovo W541, since we advertise Windows 2013 to the ACPI layer. Signed-off-by: Dave Airlie --- drivers/gpu/drm/nouveau/nouveau_vga.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c index af89c36..b987427f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_vga.c +++ b/drivers/gpu/drm/nouveau/nouveau_vga.c @@ -101,8 +101,12 @@ nouveau_vga_init(struct nouveau_drm *drm) runtime = true; vga_switcheroo_register_client(dev->pdev, &nouveau_switcheroo_ops, runtime); - if (runtime && nouveau_is_v1_dsm() && !nouveau_is_optimus()) - vga_switcheroo_init_domain_pm_ops(drm->dev->dev, &drm->vga_pm_domain); + if (runtime) { + if (nouveau_is_v1_dsm() && !nouveau_is_optimus()) + vga_switcheroo_init_domain_pm_ops(drm->dev->dev, &drm->vga_pm_domain); + else if (nouveau_is_optimus()) + vga_switcheroo_init_parent_pr3_ops(drm->dev->dev, &drm->vga_pm_domain); + } } void @@ -117,7 +121,7 @@ nouveau_vga_fini(struct nouveau_drm *drm) runtime = true; vga_switcheroo_unregister_client(dev->pdev); - if (runtime && nouveau_is_v1_dsm() && !nouveau_is_optimus()) + if (runtime && (nouveau_is_v1_dsm() || nouveau_is_optimus())) vga_switcheroo_fini_domain_pm_ops(drm->dev->dev); vga_client_register(dev->pdev, NULL, NULL, NULL); } -- 2.5.0