From: "Christian König" <deathsimple@vodafone.de>
To: alexdeucher@gmail.com
Cc: dri-devel@lists.freedesktop.org,
Alex Deucher <alexander.deucher@amd.com>,
stable@vger.kernel.org
Subject: Re: [PATCH 1/2] drm/radeon: fix S/R on VM systems (cayman/TN/SI)
Date: Tue, 12 Mar 2013 09:59:00 +0100 [thread overview]
Message-ID: <513EEE54.5040603@vodafone.de> (raw)
In-Reply-To: <1363035984-4861-2-git-send-email-alexdeucher@gmail.com>
Am 11.03.2013 22:06, schrieb alexdeucher@gmail.com:
> From: Alex Deucher <alexander.deucher@amd.com>
>
> We weren't properly tearing down the VM sub-alloctor
> on suspend leading to bogus VM PTs on resume.
>
> Fixes:
> https://bugs.freedesktop.org/show_bug.cgi?id=60439
>
> Tested-by: Dmitry Cherkasov <Dmitrii.Cherkasov@amd.com>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> Cc: stable@vger.kernel.org
I'm still wondering how I missed that. Anyway, I have a NAK on the other
patch, but this one is:
Reviewed-by: Christian König <christian.koenig@amd.com>
Christian.
> ---
> drivers/gpu/drm/radeon/ni.c | 1 +
> drivers/gpu/drm/radeon/si.c | 1 +
> 2 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
> index 3d81ca7..e6f3989 100644
> --- a/drivers/gpu/drm/radeon/ni.c
> +++ b/drivers/gpu/drm/radeon/ni.c
> @@ -1780,6 +1780,7 @@ int cayman_resume(struct radeon_device *rdev)
> int cayman_suspend(struct radeon_device *rdev)
> {
> r600_audio_fini(rdev);
> + radeon_vm_manager_fini(rdev);
> cayman_cp_enable(rdev, false);
> cayman_dma_stop(rdev);
> evergreen_irq_suspend(rdev);
> diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
> index 9128120..bafbe32 100644
> --- a/drivers/gpu/drm/radeon/si.c
> +++ b/drivers/gpu/drm/radeon/si.c
> @@ -4469,6 +4469,7 @@ int si_resume(struct radeon_device *rdev)
>
> int si_suspend(struct radeon_device *rdev)
> {
> + radeon_vm_manager_fini(rdev);
> si_cp_enable(rdev, false);
> cayman_dma_stop(rdev);
> si_irq_suspend(rdev);
next prev parent reply other threads:[~2013-03-12 8:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-11 21:06 [PATCH 0/2] Properly suspend/resume sub-allocator alexdeucher
2013-03-11 21:06 ` [PATCH 1/2] drm/radeon: fix S/R on VM systems (cayman/TN/SI) alexdeucher
2013-03-12 8:59 ` Christian König [this message]
2013-03-11 21:06 ` [PATCH 2/2] drm/radeon: tear down the IB pool on suspend alexdeucher
2013-03-12 8:52 ` Christian König
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=513EEE54.5040603@vodafone.de \
--to=deathsimple@vodafone.de \
--cc=alexander.deucher@amd.com \
--cc=alexdeucher@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=stable@vger.kernel.org \
/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