diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-08-30 14:26:26 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-08-30 14:26:26 +0200 |
| commit | 02af1db05dcce05603eb51ba3e93c6f88d6ea287 (patch) | |
| tree | 6b99bb9397e240e0fd8b4c0ef3a2cefdcf7a4934 /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |
| parent | Merge tag 'thermal-v6.0-rc2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux (diff) | |
| parent | Merge tag 'thermal-v6.1-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux (diff) | |
| download | linux-rng-02af1db05dcce05603eb51ba3e93c6f88d6ea287.tar.xz linux-rng-02af1db05dcce05603eb51ba3e93c6f88d6ea287.zip | |
Merge back thermal control material for v6.1.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index d8f1335bc68f..b7bae833c804 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -837,16 +837,12 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p) continue; r = amdgpu_vm_bo_update(adev, bo_va, false); - if (r) { - mutex_unlock(&p->bo_list->bo_list_mutex); + if (r) return r; - } r = amdgpu_sync_fence(&p->job->sync, bo_va->last_pt_update); - if (r) { - mutex_unlock(&p->bo_list->bo_list_mutex); + if (r) return r; - } } r = amdgpu_vm_handle_moved(adev, vm); |