From: Mikita Lipski Date: Wed, 14 Mar 2018 17:41:29 +0000 (-0400) Subject: drm/amdgpu: Use atomic function to disable crtcs with dc enabled X-Git-Tag: Ubuntu-5.13.0-19.19~11358^2~4^2~64 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ff97cba8c1b24f6017e16ca6facca3c3f32d2c00;p=mirror_ubuntu-jammy-kernel.git 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: Mikita Lipski Reviewed-by: Andrey Grodzovsky Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index beabb90e595a..cdf7a6cde603 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -2446,9 +2446,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) - drm_crtc_force_disable_all(adev->ddev); - + 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_pm_sysfs_fini(adev);