Commit 006c26a0 authored by Andrey Grodzovsky's avatar Andrey Grodzovsky Committed by Alex Deucher
Browse files

drm/amd/display: Fix crash on device remove/driver unload 



Why:
DC core is being released from DM before it's referenced
from hpd_rx wq destruction code.

How: Move hpd_rx destruction before DC core destruction.

Signed-off-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7f6ab50a

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+12 −12
Original line number Diff line number Diff line
@@ -1572,6 +1572,18 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev) 
				      &adev->dm.dmub_bo_gpu_addr,

				      &adev->dm.dmub_bo_cpu_addr);



	if (adev->dm.hpd_rx_offload_wq) {

		for (i = 0; i < adev->dm.dc->caps.max_links; i++) {

			if (adev->dm.hpd_rx_offload_wq[i].wq) {

				destroy_workqueue(adev->dm.hpd_rx_offload_wq[i].wq);

				adev->dm.hpd_rx_offload_wq[i].wq = NULL;

			}

		}



		kfree(adev->dm.hpd_rx_offload_wq);

		adev->dm.hpd_rx_offload_wq = NULL;

	}



	/* DC Destroy TODO: Replace destroy DAL */

	if (adev->dm.dc)

		dc_destroy(&adev->dm.dc);
@@ -1590,18 +1602,6 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev) 
		adev->dm.freesync_module = NULL;

	}



	if (adev->dm.hpd_rx_offload_wq) {

		for (i = 0; i < adev->dm.dc->caps.max_links; i++) {

			if (adev->dm.hpd_rx_offload_wq[i].wq) {

				destroy_workqueue(adev->dm.hpd_rx_offload_wq[i].wq);

				adev->dm.hpd_rx_offload_wq[i].wq = NULL;

			}

		}



		kfree(adev->dm.hpd_rx_offload_wq);

		adev->dm.hpd_rx_offload_wq = NULL;

	}



	mutex_destroy(&adev->dm.audio_lock);

	mutex_destroy(&adev->dm.dc_lock);