diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-06 09:31:18 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-06 09:31:18 +0100 |
| commit | d598c3c46ea69ea974f0613a651cd4ef3be0c870 (patch) | |
| tree | 92c4b32aa13596484d81988f530d888586ff7c7a /drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | |
| parent | usb: core: Fix file path that does not exist (diff) | |
| parent | Linux 5.16-rc4 (diff) | |
| download | wireguard-linux-d598c3c46ea69ea974f0613a651cd4ef3be0c870.tar.xz wireguard-linux-d598c3c46ea69ea974f0613a651cd4ef3be0c870.zip | |
Merge 5.16-rc4 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 4 |
1 files 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 ce982afeff91..ac9a8cd21c4b 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); |