From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F1ADC433DB for ; Mon, 29 Mar 2021 02:15:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EDAFB60C41 for ; Mon, 29 Mar 2021 02:15:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229719AbhC2COX (ORCPT ); Sun, 28 Mar 2021 22:14:23 -0400 Received: from ozlabs.org ([203.11.71.1]:57127 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229645AbhC2COS (ORCPT ); Sun, 28 Mar 2021 22:14:18 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4F7x2z4SZnz9sVw; Mon, 29 Mar 2021 13:14:02 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1616984044; bh=k9kCaTFSgKm9tQfT1MUAvppABz0an6Oi0rH94pjamiI=; h=Date:From:To:Cc:Subject:From; b=e276cr5qjXA0c5ua2WQptS3A/LM1/RIIee8HExUKua5b4/5qcrHxazaWH2xSDtRbp J8xVr13wVSFG2W5nEEvFDCuef8o9beM8sCAK0ZUrqODYyNd7q8qIvG0CIcYdvoQwRy jcyVKfe4fVqg2uzs5uvu+sGdIB1moRqSUY5BSiRNB8EiuaJFThpkpgz+P4CZaAbgpE i52wiQLa4m2spLGhCg82cuNdzcz/Xezbt66WRaVU/ZK+K7BBB1oPKHblworrwrKR87 +CVCtYhFJCXvQg68ENM2wRVjR7bU8bcK7u+/cFk6sA10ENnaqjOuWlj/0lx/pC4fAI xuMrJwBjHMCGQ== Date: Mon, 29 Mar 2021 13:14:01 +1100 From: Stephen Rothwell To: Dave Airlie , DRI Cc: Alex Deucher , Linux Kernel Mailing List , Linux Next Mailing List , shaoyunl Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20210329131401.15724766@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/g_NQGzQ9qT.S6dVnkopD=ch"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/g_NQGzQ9qT.S6dVnkopD=ch Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_device.c between commits: 9adb125dde69 ("drm/amdgpu: re-enable suspend phase 2 for S0ix") 4021229e32bd ("drm/amdgpu/swsmu: skip gfx cgpg on s0ix suspend") 9bb735abcbd8 ("drm/amdgpu: update comments about s0ix suspend/resume") from Linus' tree and commit: e3c1b0712fdb ("drm/amdgpu: Reset the devices in the XGMI hive duirng prob= e") from the drm tree. I fixed it up (I think - see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 8a5a8ff5d362,0f82c5d21237..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@@ -2743,16 -2712,15 +2720,25 @@@ static int amdgpu_device_ip_suspend_pha continue; } =20 + /* skip suspend of gfx and psp for S0ix + * gfx is in gfxoff state, so on resume it will exit gfxoff just + * like at runtime. PSP is also part of the always on hardware + * so no need to suspend it. + */ + if (adev->in_s0ix && + (adev->ip_blocks[i].version->type =3D=3D AMD_IP_BLOCK_TYPE_PSP || + adev->ip_blocks[i].version->type =3D=3D AMD_IP_BLOCK_TYPE_GFX)) + continue; + + /* skip unnecessary suspend if we do not initialize them yet */ + if (adev->gmc.xgmi.pending_reset && + !(adev->ip_blocks[i].version->type =3D=3D AMD_IP_BLOCK_TYPE_GMC || + adev->ip_blocks[i].version->type =3D=3D AMD_IP_BLOCK_TYPE_SMC || + adev->ip_blocks[i].version->type =3D=3D AMD_IP_BLOCK_TYPE_COMMON = || + adev->ip_blocks[i].version->type =3D=3D AMD_IP_BLOCK_TYPE_IH)) { + adev->ip_blocks[i].status.hw =3D false; + continue; + } /* XXX handle errors */ r =3D adev->ip_blocks[i].version->funcs->suspend(adev); /* XXX handle errors */ --Sig_/g_NQGzQ9qT.S6dVnkopD=ch Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmBhN+kACgkQAVBC80lX 0GyIHwf/WDrD2AvhZk2+xd2OuiACRlE6HXHMppYBDQyq7alR4iWQDeunMCdWjBzX 0QzyE03CWLgiZkJu/RfNkrYej0oNilYuI+zVCuNfb6yAZjfbjg/7oDbI1GaV/aEh +1RmtZehAyfFG/qWNllHTBpl8cv/RaVeotbLrOwNzToZbVj7hmwSn4JlpEQ/QxB7 AxvlCb73O3aCtFFcE5xJDjiaU0w4Bc0emgmC3dt3biOX0K+2M4FHGQqBJn9W2ro8 bzlYEFxz4Fps2fs+hMRWSPs09pbBak4PfFMD9+S7qcWsszywYj8wLX6NuiA+jTfk dfE3mOW7Li0ybRZX17B/4gQtfNIRWg== =7sDt -----END PGP SIGNATURE----- --Sig_/g_NQGzQ9qT.S6dVnkopD=ch--