]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
drm/amdgpu: fix NULL in vm_grab_id while S3 back
authorChunming Zhou <David1.Zhou@amd.com>
Tue, 29 Dec 2015 03:57:38 +0000 (11:57 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 4 Jan 2016 22:17:49 +0000 (17:17 -0500)
vm_manager_fini shouldn't be in suspend phase.

Signed-off-by: Chunming Zhou <David1.Zhou@amd.com>
Reviewed-by: Ken Wang <Qingqing.Wang@amd.com>
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c

index dababe40a685743d69109f13ca4d30df6f4e91d3..3f956065d069125df0200f78527437134bf7f6d1 100644 (file)
@@ -1016,7 +1016,6 @@ static int gmc_v7_0_suspend(void *handle)
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
        if (adev->vm_manager.enabled) {
-               amdgpu_vm_manager_fini(adev);
                gmc_v7_0_vm_fini(adev);
                adev->vm_manager.enabled = false;
        }
index adc25f87fc1811fff876c5beceac65ef6d76f0f3..c0c9a0101eb453c3139b9796ac8449350f0fb4bd 100644 (file)
@@ -1037,7 +1037,6 @@ static int gmc_v8_0_suspend(void *handle)
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
        if (adev->vm_manager.enabled) {
-               amdgpu_vm_manager_fini(adev);
                gmc_v8_0_vm_fini(adev);
                adev->vm_manager.enabled = false;
        }