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

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

drm/amdgpu: stop/resume fb access when gpu reset V3 



V2: Add wait_for_mc_idle after stopping fb access
V3:
	1. Remove resume fb access since there is no need to
   	do that for gpu reset.
	2. Move stop fb access to amdgpu_gpu_reset function,
	since it's the same for all asics.

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarChunming Zhou <David1.Zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com> (V1)
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e013c91c

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

+7 −0
Original line number Diff line number Diff line
@@ -1969,6 +1969,13 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev) 
	}



retry:

	/* Disable fb access */

	if (adev->mode_info.num_crtc) {

		struct amdgpu_mode_mc_save save;

		amdgpu_display_stop_mc_access(adev, &save);

		amdgpu_wait_for_idle(adev, AMD_IP_BLOCK_TYPE_GMC);

	}



	r = amdgpu_asic_reset(adev);

	/* post card */

	amdgpu_atom_asic_init(adev->mode_info.atom_context);