drm/amdgpu: move full access into amdgpu_device_ip_suspend (e7819644) · Commits · 戴 / test

It will be more safe to make full-acess include both phase1 and phase2. Then accessing special registeris wherever at phase1 or phase2 will not block any shutdown and suspend process under virtualization. Signed-off-by:

Yintian Tao <yttao@amd.com> Acked-by:

Alex Deucher <alexander.deucher@amd.com> Signed-off-by:

Alex Deucher <alexander.deucher@amd.com>

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -1932,9 +1932,6 @@ static int amdgpu_device_ip_suspend_phase1(struct amdgpu_device *adev)
		{
		int i, r;

		if (amdgpu_sriov_vf(adev))
		amdgpu_virt_request_full_gpu(adev, false);

		amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE);
		amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE);

		@@ -1953,9 +1950,6 @@ static int amdgpu_device_ip_suspend_phase1(struct amdgpu_device *adev)
		}
		}

		if (amdgpu_sriov_vf(adev))
		amdgpu_virt_release_full_gpu(adev, false);

		return 0;
		}

		@@ -2007,11 +2001,17 @@ int amdgpu_device_ip_suspend(struct amdgpu_device *adev)
		{
		int r;

		if (amdgpu_sriov_vf(adev))
		amdgpu_virt_request_full_gpu(adev, false);

		r = amdgpu_device_ip_suspend_phase1(adev);
		if (r)
		return r;
		r = amdgpu_device_ip_suspend_phase2(adev);

		if (amdgpu_sriov_vf(adev))
		amdgpu_virt_release_full_gpu(adev, false);

		return r;
		}

Admin message