Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp598763pxb; Tue, 5 Apr 2022 15:28:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzHh7WM8i55e6YqmsBLJ5IB4I1eBILfL5MYkc/et1pL1Va66KIe4AcIM+Gyq/kjiOlR0EXO X-Received: by 2002:a05:6a00:21c2:b0:4fe:81f:46c7 with SMTP id t2-20020a056a0021c200b004fe081f46c7mr5705988pfj.5.1649197680741; Tue, 05 Apr 2022 15:28:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649197680; cv=none; d=google.com; s=arc-20160816; b=yM70tV7+TqOIJzFTl6vDW81fZQ5uh0znjOFM3mCRxF1q1g7RY8MvyJOEv01Nvpr4po CYgIBQJU6EJjye535JaoiSj7NRUGC4DruX2UJ8KRiCBbI35RcK+FwHPd5W04UTJSMnIo NiRJ29cwGoAORnT2PUU2U9YN4jenfFz0mOqUTl2nuSL2ewd/y6Oqf92Wk97qfh7CIeh2 xqkhZy+qaGCTUnBNcrG/YbsfnZBELrOz7ek2kwzp6Kai7E6BY6K80Jwz2UYwV8T0Eh8D nycRYiw910+5UEu55th4iEfJFwFwT/CxmjUGBVs9GYchMh9M0DBALD/UlWPs59sEjQZz NHGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1rETZiS0A9aawbEgMNH5l5tXqF7HzjhOeZcUAfSK4g0=; b=SULP2hb4FpzGyXBau5VJ8rYoDbCS8TDyPfxXnANPxWcNuJLB1Bvf1DbQa7Glanbwa/ jNtO3D6nqx4H2m/wZDZCczFV13YE4nlxtPtxhKa/BKSfXKJ8TS62RmMyh3jRsnpUqIXm ryKXDmH/J3MmXOuR6v78jx1j2s9e2Jv2Ibf9LqAIm8OsJWwTSKlkhg2nuYTcNBjno2VX +JlaFIUqnPZDrqnhubIexZ+1zsCe/14acb7501fsKPDju5sSAgcEPRiS40HWGEkZCSk1 2M7moaE3nhzlJE7NrgtmfTok1nbFIvnr//hoo3Bn9fk0Gs8oITKJpV5xz8LrU+1SB4xx Ey7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yjpxTMkx; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id 67-20020a630846000000b003816043ee71si15601529pgi.102.2022.04.05.15.28.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 15:28:00 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yjpxTMkx; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 800851F9FF8; Tue, 5 Apr 2022 15:10:13 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353475AbiDEOOw (ORCPT + 99 others); Tue, 5 Apr 2022 10:14:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237937AbiDEJcH (ORCPT ); Tue, 5 Apr 2022 05:32:07 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D50D32E5; Tue, 5 Apr 2022 02:19:14 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 712516144D; Tue, 5 Apr 2022 09:19:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A01BC385A3; Tue, 5 Apr 2022 09:19:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649150353; bh=80uFsQUPPQey6gmqzFrvrYIR2Wecj3/7tPqFrUDtep8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yjpxTMkxv0S0+ZxYeuchz1AZLZLyK9UmybrdHCISMMzGmubxQrsfQktw6X3bl6l4h gt2x0eWr+/URnyDAdaJrZvVg3of27RS1hO+SYmPfoxNJexZcHGHHs7oDkZjDWocsdj W+xoBu+4aMYYUX+WPsUOrrnLvai91aoAV2O1lnW8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mario Limonciello , Alex Deucher Subject: [PATCH 5.15 027/913] drm/amdgpu: only check for _PR3 on dGPUs Date: Tue, 5 Apr 2022 09:18:09 +0200 Message-Id: <20220405070340.629555726@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070339.801210740@linuxfoundation.org> References: <20220405070339.801210740@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alex Deucher commit 85ac2021fe3ace59cc0afd6edf005abad35625b0 upstream. We don't support runtime pm on APUs. They support more dynamic power savings using clock and powergating. Reviewed-by: Mario Limonciello Tested-by: Mario Limonciello Signed-off-by: Alex Deucher Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -2178,8 +2178,10 @@ static int amdgpu_device_ip_early_init(s !pci_is_thunderbolt_attached(to_pci_dev(dev->dev))) adev->flags |= AMD_IS_PX; - parent = pci_upstream_bridge(adev->pdev); - adev->has_pr3 = parent ? pci_pr3_present(parent) : false; + if (!(adev->flags & AMD_IS_APU)) { + parent = pci_upstream_bridge(adev->pdev); + adev->has_pr3 = parent ? pci_pr3_present(parent) : false; + } amdgpu_amdkfd_device_probe(adev);