Received: by 10.223.185.116 with SMTP id b49csp4173865wrg; Mon, 26 Feb 2018 12:32:50 -0800 (PST) X-Google-Smtp-Source: AH8x227gwtfN+/qu363UERGB8LIrLfFMe+rZ+SKGn438tOFFyuCJvyk0V6BldkdlBEGQEKtpcl7M X-Received: by 10.99.148.17 with SMTP id m17mr9377850pge.367.1519677170150; Mon, 26 Feb 2018 12:32:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519677170; cv=none; d=google.com; s=arc-20160816; b=AGOXbs4iQbMDkC9NsZRkjSekEhZGEOn6ukcBIhZWd1ji7KcgC5KjCLWck1wss1ioUN 3y+wI8OdlXqO0wDWcz0XWyu/RThkB/huPoO9cl0ftP4pWz9ko/VlA5dwjXSl02JleJyQ 30y8KPmPIogcuOID4VXYvBB8+z0ybzYKQBGlqMCI884cVuO1uf4iGM9xEsKHt5iEUi9q mVsOT+FmIoQ72EebBRJeMf+GwwJO+9Nfwt8pQmYxt88WL3bdob9zWzqaveqFvmqBDH6p 77+UqTDBsaJNKoNcU3HQbYAgWb2/XRuvLcuX1CSAuXjZDyXUeF5dKc0a6cZx2iHCYrIb y9xw== 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=i7Ea4lP1I3Qus2sVjwQi+gDOYcI8lmbVfiXcVvRDFNQ=; b=NZMO2W9kV4jsnvL9Wxg8NQQhcKgtoFrSB7rLJC+iouuEMb9hB56nOO0pzG50Oxm1LH OBHI5jZMRvaCTNBK5MIC6ky4WReVSTeybg6IOnW5pnAPgmgZ9D3u3d0QSUN3lsNyeaSM z9les6w3NsfWdVmXkEKwTOtGpIiVPj24d6GS6IOlH7VbKoHfbR/2aIwGougwTzW5sfyI 6JWkJZbtIwRGBDbs1B8ntOEpf87rpgl9nvtfCTpb/w/KFVFisa1EMbrR4KtdwvhYK4Lo gGnYf6tF2Gr7a7o6k8lHXaQZfue4IyKgyF7ty7tu9p9G4AFKgIWNzHwW/pcHLzBL78Z0 7KCg== 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 m6si2544922pgu.633.2018.02.26.12.32.34; Mon, 26 Feb 2018 12:32:50 -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 S1754007AbeBZU26 (ORCPT + 99 others); Mon, 26 Feb 2018 15:28:58 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:37388 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751861AbeBZU2y (ORCPT ); Mon, 26 Feb 2018 15:28:54 -0500 Received: from localhost (clnet-b04-243.ikbnet.co.at [83.175.124.243]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 10A4AEE1; Mon, 26 Feb 2018 20:28:53 +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.15 61/64] drm/amdgpu: Avoid leaking PM domain on driver unbind (v2) Date: Mon, 26 Feb 2018 21:22:38 +0100 Message-Id: <20180226202156.052750985@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180226202153.453363333@linuxfoundation.org> References: <20180226202153.453363333@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.15-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 @@ -2228,8 +2228,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; if (!pci_is_thunderbolt_attached(adev->pdev))