Commit 0aa0725f authored by Roy Sun's avatar Roy Sun Committed by Alex Deucher
Browse files

drm/amd/amdgpu: Cancel the hrtimer in sw_fini 



Move the process of cancelling hrtimer to sw_fini

Signed-off-by: default avatarRoy Sun <Roy.Sun@amd.com>
Reviewed-by: default avatarEmily Deng <Emily.Deng@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0064b0ce

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

+5 −7
Original line number Diff line number Diff line
@@ -421,6 +421,11 @@ static int dce_virtual_sw_init(void *handle) 
static int dce_virtual_sw_fini(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	int i = 0;



	for (i = 0; i < adev->mode_info.num_crtc; i++)

		if (adev->mode_info.crtcs[i])

			hrtimer_cancel(&adev->mode_info.crtcs[i]->vblank_timer);



	kfree(adev->mode_info.bios_hardcoded_edid);
@@ -480,13 +485,6 @@ static int dce_virtual_hw_init(void *handle) 


static int dce_virtual_hw_fini(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	int i = 0;



	for (i = 0; i<adev->mode_info.num_crtc; i++)

		if (adev->mode_info.crtcs[i])

			hrtimer_cancel(&adev->mode_info.crtcs[i]->vblank_timer);



	return 0;

}