Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1de7415 authored by Chunming Zhou's avatar Chunming Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: fix NULL in vm_grab_id while S3 back 



vm_manager_fini shouldn't be in suspend phase.

Signed-off-by: default avatarChunming Zhou <David1.Zhou@amd.com>
Reviewed-by: default avatarKen Wang <Qingqing.Wang@amd.com>
parent 7c9574f2

drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

	}