From: Alex Deucher <alexdeucher@gmail.com>
To: Felix Kuehling <Felix.Kuehling@amd.com>
Cc: amd-gfx@lists.freedesktop.org,
Linux regression tracking <regressions@leemhuis.info>,
Vasant Hegde <vasant.hegde@amd.com>,
stable@vger.kernel.org
Subject: Re: [PATCH] drm/amdgpu: Don't resume IOMMU after incomplete init
Date: Tue, 14 Mar 2023 14:12:51 -0400 [thread overview]
Message-ID: <CADnq5_MzJybKAOdztx=F=G+MFVqofYOkgLFSyA3wRp+h_5=tbg@mail.gmail.com> (raw)
In-Reply-To: <20230314175359.1747662-1-Felix.Kuehling@amd.com>
On Tue, Mar 14, 2023 at 1:54 PM Felix Kuehling <Felix.Kuehling@amd.com> wrote:
>
> Check kfd->init_complete in kgd2kfd_iommu_resume, consistent with other
> kgd2kfd calls. This should fix IOMMU errors on resume from suspend when
> KFD IOMMU initialization failed.
>
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217170
> Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2454
> Cc: Vasant Hegde <vasant.hegde@amd.com>
> Cc: Linux regression tracking (Thorsten Leemhuis) <regressions@leemhuis.info>
> Cc: stable@vger.kernel.org
> Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/amd/amdkfd/kfd_device.c | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> index 521dfa88aad8..989c6aa2620b 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> @@ -60,6 +60,7 @@ static int kfd_gtt_sa_init(struct kfd_dev *kfd, unsigned int buf_size,
> unsigned int chunk_size);
> static void kfd_gtt_sa_fini(struct kfd_dev *kfd);
>
> +static int kfd_resume_iommu(struct kfd_dev *kfd);
> static int kfd_resume(struct kfd_dev *kfd);
>
> static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd)
> @@ -625,7 +626,7 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
>
> svm_migrate_init(kfd->adev);
>
> - if (kgd2kfd_resume_iommu(kfd))
> + if (kfd_resume_iommu(kfd))
> goto device_iommu_error;
>
> if (kfd_resume(kfd))
> @@ -773,6 +774,14 @@ int kgd2kfd_resume(struct kfd_dev *kfd, bool run_pm)
> }
>
> int kgd2kfd_resume_iommu(struct kfd_dev *kfd)
> +{
> + if (!kfd->init_complete)
> + return 0;
> +
> + return kfd_resume_iommu(kfd);
> +}
> +
> +static int kfd_resume_iommu(struct kfd_dev *kfd)
> {
> int err = 0;
>
> --
> 2.34.1
>
prev parent reply other threads:[~2023-03-14 18:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-14 17:53 [PATCH] drm/amdgpu: Don't resume IOMMU after incomplete init Felix Kuehling
2023-03-14 18:12 ` Alex Deucher [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CADnq5_MzJybKAOdztx=F=G+MFVqofYOkgLFSyA3wRp+h_5=tbg@mail.gmail.com' \
--to=alexdeucher@gmail.com \
--cc=Felix.Kuehling@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=regressions@leemhuis.info \
--cc=stable@vger.kernel.org \
--cc=vasant.hegde@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).