projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e39701e
)
drm/nouveau: uvmm: remove incorrect calls to mas_unlock()
author
Danilo Krummrich
<dakr@redhat.com>
Mon, 7 Aug 2023 16:32:25 +0000
(18:32 +0200)
committer
Danilo Krummrich
<dakr@redhat.com>
Tue, 8 Aug 2023 02:47:19 +0000
(
04:47
+0200)
Remove incorrect calls to mas_unlock() in the unwind path of
__nouveau_uvma_region_insert(). The region maple tree uses an external
lock instead, namely the global uvmm lock.
Fixes:
b88baab82871
("drm/nouveau: implement new VM_BIND uAPI")
Reported-by: kernel test robot <lkp@intel.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Danilo Krummrich <dakr@redhat.com>
Link:
https://patchwork.freedesktop.org/patch/msgid/20230807163238.2091-5-dakr@redhat.com
drivers/gpu/drm/nouveau/nouveau_uvmm.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nouveau_uvmm.c
b/drivers/gpu/drm/nouveau/nouveau_uvmm.c
index
2acbac7
..
91b964e
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_uvmm.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_uvmm.c
@@
-279,15
+279,11
@@
__nouveau_uvma_region_insert(struct nouveau_uvmm *uvmm,
u64 last = addr + range - 1;
MA_STATE(mas, &uvmm->region_mt, addr, addr);
- if (unlikely(mas_walk(&mas))) {
- mas_unlock(&mas);
+ if (unlikely(mas_walk(&mas)))
return -EEXIST;
- }
- if (unlikely(mas.last < last)) {
- mas_unlock(&mas);
+ if (unlikely(mas.last < last))
return -EEXIST;
- }
mas.index = addr;
mas.last = last;