diff options
| author | Lang Yu <Lang.Yu@amd.com> | 2024-04-19 15:40:08 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-05-02 16:35:29 +0200 |
| commit | f3fb7288e8b0fefe4f945522beede02cd2adc916 (patch) | |
| tree | 6f7a1a344c2e305bdf0306d0a3a3b4f136ca6810 | |
| parent | 9fcb0bb45e6a9427fb09c633f480827ca2d19a40 (diff) | |
| download | linux-stable-f3fb7288e8b0fefe4f945522beede02cd2adc916.tar.gz linux-stable-f3fb7288e8b0fefe4f945522beede02cd2adc916.tar.bz2 linux-stable-f3fb7288e8b0fefe4f945522beede02cd2adc916.zip | |
drm/amdgpu/umsch: don't execute umsch test when GPU is in reset/suspend
commit 661d71ee5a010bdc0663e0db701931aff920e8e1 upstream.
umsch test needs full GPU functionality(e.g., VM update, TLB flush,
possibly buffer moving under memory pressure) which may be not ready
under these states. Just skip it to avoid potential issues.
Signed-off-by: Lang Yu <Lang.Yu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Veerabadhran Gopalakrishnan <Veerabadhran.Gopalakrishnan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c index bfbf59326ee1..1b5ef32108e1 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c @@ -766,6 +766,9 @@ static int umsch_mm_late_init(void *handle) { struct amdgpu_device *adev = (struct amdgpu_device *)handle; + if (amdgpu_in_reset(adev) || adev->in_s0ix || adev->in_suspend) + return 0; + return umsch_mm_test(adev); } |