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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E54CC433EF for ; Mon, 15 Nov 2021 23:32:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 882C761B04 for ; Mon, 15 Nov 2021 23:32:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240813AbhKOXfl (ORCPT ); Mon, 15 Nov 2021 18:35:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:44638 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245583AbhKOTUs (ORCPT ); Mon, 15 Nov 2021 14:20:48 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3359E63568; Mon, 15 Nov 2021 18:37:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1637001444; bh=QuAHEIBx/bpVeC2FkUGBqxUxdDNi7NOtet59OMG3eDM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FDrDXISNpVVxBkMVNTNuGNq8EYBIPc/eJmgTuZhQ0LDsWPT1nsnro/XtlpL9Mehvo NsJ+6Kvt/MSw/QXAIYxR8D87joCMJgHA1H+EnVx9dsbu3VoRdNfPMrOSY5f8PEySyy BpYaRr5/JY9vLsviWa1OjpTyPyyZ4tvqtGtupjaQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, James Zhu , Felix Kuehling , Alex Deucher , Sasha Levin Subject: [PATCH 5.15 192/917] drm/amdgpu: move iommu_resume before ip init/resume Date: Mon, 15 Nov 2021 17:54:47 +0100 Message-Id: <20211115165435.301392847@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115165428.722074685@linuxfoundation.org> References: <20211115165428.722074685@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: James Zhu [ Upstream commit 9cec53c18a3170c7e5673c414da56aeecee94832 ] Separate iommu_resume from kfd_resume, and move it before other amdgpu ip init/resume. Bug: https://bugzilla.kernel.org/show_bug.cgi?id=211277 Signed-off-by: James Zhu Reviewed-by: Felix Kuehling Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index b8d9004fb1635..5b88c873c8a89 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -2394,6 +2394,10 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) if (r) goto init_failed; + r = amdgpu_amdkfd_resume_iommu(adev); + if (r) + goto init_failed; + r = amdgpu_device_ip_hw_init_phase1(adev); if (r) goto init_failed; -- 2.33.0