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

Commit d1bb88e0 authored by Mikita Lipski's avatar Mikita Lipski Committed by Alex Deucher
Browse files

drm/amdgpu: Use atomic function to disable crtcs with dc enabled 



This change fixes the deadlock when unloading the driver with displays
connected.

Signed-off-by: default avatarMikita Lipski <mikita.lipski@amd.com>
Reviewed-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2681bc79

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

+6 −3
Original line number Diff line number Diff line
@@ -2063,9 +2063,12 @@ void amdgpu_device_fini(struct amdgpu_device *adev) 


	DRM_INFO("amdgpu: finishing device.\n");

	adev->shutdown = true;

	if (adev->mode_info.mode_config_initialized)

	if (adev->mode_info.mode_config_initialized){

		if (!amdgpu_device_has_dc_support(adev))

			drm_crtc_force_disable_all(adev->ddev);



		else

			drm_atomic_helper_shutdown(adev->ddev);

	}

	amdgpu_ib_pool_fini(adev);

	amdgpu_fence_driver_fini(adev);

	amdgpu_fbdev_fini(adev);