From nobody Fri Dec 19 07:46:25 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A644C6FA82 for ; Tue, 13 Sep 2022 14:11:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232752AbiIMOL3 (ORCPT ); Tue, 13 Sep 2022 10:11:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232740AbiIMOKO (ORCPT ); Tue, 13 Sep 2022 10:10:14 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9033758B53; Tue, 13 Sep 2022 07:09:20 -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 sin.source.kernel.org (Postfix) with ESMTPS id BECA8CE10F7; Tue, 13 Sep 2022 14:09:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17FCCC433C1; Tue, 13 Sep 2022 14:09:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663078156; bh=avKLgB8ycs/5i5FbGLyyAohN1rYc0v6FmHyhCFQT7ME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OuZyVp5sjtMQOd4KQfzK9os6hSB27x1T55ERWer6RZqSc0dRv1A2fM77GRI/Wo0xs MAlFfUgMVWu/RZWgxmsSoKiR09Pij9DTKgcZd9GWfo1Y5gh49kog7jOV6K/ps9Xj+q 0OJ9a7cgK6sygeYQRZuogTI1oJ3GlTDryu2LFK84= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Felix Kuehling , shaoyunl , Alex Deucher , Sasha Levin Subject: [PATCH 5.19 016/192] drm/amdgpu: Remove the additional kfd pre reset call for sriov Date: Tue, 13 Sep 2022 16:02:02 +0200 Message-Id: <20220913140410.731567502@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220913140410.043243217@linuxfoundation.org> References: <20220913140410.043243217@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: shaoyunl [ Upstream commit 06671734881af2bcf7f453661b5f8616e32bb3fc ] The additional call is caused by merge conflict Reviewed-by: Felix Kuehling Signed-off-by: shaoyunl Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/a= md/amdgpu/amdgpu_device.c index ea2b74c0fd229..67d4a3c13ed19 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -4475,8 +4475,6 @@ static int amdgpu_device_reset_sriov(struct amdgpu_de= vice *adev, retry: amdgpu_amdkfd_pre_reset(adev); =20 - amdgpu_amdkfd_pre_reset(adev); - if (from_hypervisor) r =3D amdgpu_virt_request_full_gpu(adev, true); else --=20 2.35.1