Received: by 10.223.185.116 with SMTP id b49csp4200114wrg; Mon, 26 Feb 2018 13:03:37 -0800 (PST) X-Google-Smtp-Source: AH8x2265oFT/9k0b6SwNzA9tPtBSpIXVDIQvpOwYF9vJaqyeABhV1SYuNltgwGXSlqyE15cg7UJy X-Received: by 10.98.196.199 with SMTP id h68mr11779819pfk.42.1519679017123; Mon, 26 Feb 2018 13:03:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519679017; cv=none; d=google.com; s=arc-20160816; b=zyeimGjCFv6Y21/NHhWMYsCqtIKZSkXCA9el1Mv2HdW6sKUSmlHI9bs1SWyeRiHxPu cz3FOZ452BxJP5Rkw37Zk03tyfs50H/s7RFHijyAlBpffsL5/XTUz04oSntagdM9wp3G QC/HFgkTGhpWgae3TTWvSAZcGoSFxBj7vEBFwMgdXRAPHYQqJZ4QR04PbTmhol/E5Yud bo3vXhvxf/iFbgimTBHx7bqFHAgFt8MTSgK0GJP4OvjcO3oqgQtqRlcIC5OUBqZYAY98 cqGzQXE6yI8kC+/FdRuAbI6FTAJhDwKAcg+9XEam4S4fYC65aEtYApDXnjcmHOGPCnLG iMXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=tvF/8jF88M9ij+1fDQWY3cP9znXrBcU0sZLmYlJzFoE=; b=ZQ7xpdq/Kdyly+0Sy1xTOIkdT89J047V8ykNkKTTQ4563VCASxDVM0LT6/O4JAbtU9 GDasEgF/hN4RNXJBzlfUR2xFjDsJG7rfcU/m986ui1SS9wIrumnZcmUzBpzRkkR8vIj6 5WTPDNuLN6P4mz8FkpTKab5VUNRDQRsX3NEQeMuLtWq70bkCABWPE8z6q47wq7ou+b1z oTnT6OpHM0M5sMr8c4OGgKY9C4rDZq2bS1Ign68Rcz3vVmu3OgzOyBoW5m8IvspvmWaO OUpHj7WmOV6wi+QfZcmbPe3Q0lJz4PVZxMDrqIfWFfkaow5cVxU9QQBHA0l3p4CIsKR5 HYyQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p1-v6si7131502plr.644.2018.02.26.13.02.51; Mon, 26 Feb 2018 13:03:37 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752521AbeBZVBw (ORCPT + 99 others); Mon, 26 Feb 2018 16:01:52 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:33960 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751661AbeBZUWJ (ORCPT ); Mon, 26 Feb 2018 15:22:09 -0500 Received: from localhost (clnet-b04-243.ikbnet.co.at [83.175.124.243]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 6232ED86; Mon, 26 Feb 2018 20:22:00 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lukas Wunner , Alex Deucher Subject: [PATCH 4.9 25/39] drm/amdgpu: Avoid leaking PM domain on driver unbind (v2) Date: Mon, 26 Feb 2018 21:20:46 +0100 Message-Id: <20180226201644.773192877@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180226201643.660109883@linuxfoundation.org> References: <20180226201643.660109883@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alex Deucher commit 458d876eb869d5a88b53074c6c271b8b9adc0f07 upstream. We only support vga_switcheroo and runtime pm on PX/HG systems so forcing runpm to 1 doesn't do anything useful anyway. Only call vga_switcheroo_init_domain_pm_ops() for PX/HG so that the cleanup path is correct as well. This mirrors what radeon does as well. v2: rework the patch originally sent by Lukas (Alex) Acked-by: Lukas Wunner Reported-by: Lukas Wunner Signed-off-by: Alex Deucher Signed-off-by: Lukas Wunner (v1) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 -- 1 file changed, 2 deletions(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -1678,8 +1678,6 @@ int amdgpu_device_init(struct amdgpu_dev * ignore it */ vga_client_register(adev->pdev, adev, NULL, amdgpu_vga_set_decode); - if (amdgpu_runtime_pm == 1) - runtime = true; if (amdgpu_device_is_px(ddev)) runtime = true; vga_switcheroo_register_client(adev->pdev, &amdgpu_switcheroo_ops, runtime);