diff options
| author | Simona Vetter <simona.vetter@ffwll.ch> | 2025-07-11 23:55:40 +0200 |
|---|---|---|
| committer | Simona Vetter <simona.vetter@ffwll.ch> | 2025-07-11 23:55:40 +0200 |
| commit | 7e11e01d1f1d00cb308f9351511e9597a4f70678 (patch) | |
| tree | c8c486296ada4fabcdf6908240f4bc38d80748af /drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | |
| parent | Merge tag 'drm-intel-next-2025-07-10' of https://gitlab.freedesktop.org/drm/i... (diff) | |
| parent | drm/amdgpu: fix use-after-free in amdgpu_userq_suspend+0x51a/0x5a0 (diff) | |
| download | linux-7e11e01d1f1d00cb308f9351511e9597a4f70678.tar.gz linux-7e11e01d1f1d00cb308f9351511e9597a4f70678.zip | |
Merge tag 'amd-drm-next-6.17-2025-07-11' of https://gitlab.freedesktop.org/agd5f/linux into drm-next
amd-drm-next-6.17-2025-07-11:
amdgpu:
- Clean up function signatures
- GC 10 KGQ reset fix
- SDMA reset cleanups
- Misc fixes
- LVDS fixes
- UserQ fix
amdkfd:
- Reset fix
Signed-off-by: Simona Vetter <simona.vetter@ffwll.ch>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250711205548.21052-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c index b1b80efc7993..492f1089316f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c @@ -719,7 +719,7 @@ static void amdgpu_userq_restore_worker(struct work_struct *work) struct amdgpu_fpriv *fpriv = uq_mgr_to_fpriv(uq_mgr); int ret; - flush_work(&fpriv->evf_mgr.suspend_work.work); + flush_delayed_work(&fpriv->evf_mgr.suspend_work); mutex_lock(&uq_mgr->userq_mutex); |