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 3832AC433EF for ; Tue, 28 Sep 2021 05:56:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2502D611CC for ; Tue, 28 Sep 2021 05:56:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238945AbhI1F5u (ORCPT ); Tue, 28 Sep 2021 01:57:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:47686 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238955AbhI1F5L (ORCPT ); Tue, 28 Sep 2021 01:57:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D12C1611CC; Tue, 28 Sep 2021 05:55:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632808533; bh=3j7cRuwX8oE8k8wLA4cpV+B/YSxYbRpiZh1fi63kOl0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EgFde5imkdbL72IzCgqkmyXpYey+cqvYOdZ1lHBtyA/3h7WGljMEzlFngdtAz7Q7E JNgzAbY+Zk1PerxAVcFNgv7W043k7XVBx6aKSa6eyGw/L4MvaZjs0jD4Z47qkz9NhK IUltPtuLWzgh+k5JUMj6MFKGBLTBksiid4UKp6AeDQrawAUqacK3Kl3BDJLjgN4LxJ HJ9ebrvt3zK5xTiGxvZBJ29pXiraj6OL+Z7WYdh3GqdHwKSRLPspSzReHmfzMu3J0g csXTgvAVdTvpan21+vvQfA7pH+QlcJRs3zyU6AOFVs1/RNEh9ZmYEQBaSok8UhQLlv z9NZwahl+ZpbQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Philip Yang , Felix Kuehling , Alex Deucher , Sasha Levin , christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@linux.ie, daniel@ffwll.ch, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.14 14/40] drm/amdkfd: handle svm migrate init error Date: Tue, 28 Sep 2021 01:54:58 -0400 Message-Id: <20210928055524.172051-14-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210928055524.172051-1-sashal@kernel.org> References: <20210928055524.172051-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Philip Yang [ Upstream commit 7d6687200a939176847090bbde5cb79a82792a2f ] If svm migration init failed to create pgmap for device memory, set pgmap type to 0 to disable device SVM support capability. Signed-off-by: Philip Yang Reviewed-by: Felix Kuehling Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c index dab290a4d19d..165e0ebb619d 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c @@ -894,6 +894,9 @@ int svm_migrate_init(struct amdgpu_device *adev) r = devm_memremap_pages(adev->dev, pgmap); if (IS_ERR(r)) { pr_err("failed to register HMM device memory\n"); + + /* Disable SVM support capability */ + pgmap->type = 0; devm_release_mem_region(adev->dev, res->start, res->end - res->start + 1); return PTR_ERR(r); -- 2.33.0