| From da6ce67fe45917fdd2efce4989235b414462cd65 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 24 Nov 2021 10:33:38 +0800 |
| Subject: drm/amdgpu: cancel the correct hrtimer on exit |
| |
| From: Flora Cui <flora.cui@amd.com> |
| |
| [ Upstream commit 3e467e478ed3a9701bb588d648d6e0ccb82ced09 ] |
| |
| Signed-off-by: Flora Cui <flora.cui@amd.com> |
| Reviewed-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c |
| index ce982afeff913..ac9a8cd21c4b6 100644 |
| --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c |
| @@ -504,8 +504,8 @@ static int amdgpu_vkms_sw_fini(void *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); |
| + if (adev->amdgpu_vkms_output[i].vblank_hrtimer.function) |
| + hrtimer_cancel(&adev->amdgpu_vkms_output[i].vblank_hrtimer); |
| |
| kfree(adev->mode_info.bios_hardcoded_edid); |
| kfree(adev->amdgpu_vkms_output); |
| -- |
| 2.33.0 |
| |
