artulab
projects
/
openbsd
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e1a22fe
)
drm/gem: Properly annotate WW context on drm_gem_lock_reservations() error
author
jsg
<jsg@openbsd.org>
Thu, 18 Aug 2022 00:38:21 +0000
(
00:38
+0000)
committer
jsg
<jsg@openbsd.org>
Thu, 18 Aug 2022 00:38:21 +0000
(
00:38
+0000)
From Dmitry Osipenko
da2a1aa058acd7eb2cccd9de74df0809cbe4f1f8
in linux 5.15.y/5.15.61
2939deac1fa220bc82b89235f146df1d9b52e876
in mainline linux
sys/dev/pci/drm/drm_gem.c
patch
|
blob
|
history
diff --git
a/sys/dev/pci/drm/drm_gem.c
b/sys/dev/pci/drm/drm_gem.c
index
8591b6d
..
b6b4999
100644
(file)
--- a/
sys/dev/pci/drm/drm_gem.c
+++ b/
sys/dev/pci/drm/drm_gem.c
@@
-1533,7
+1533,7
@@
retry:
ret = dma_resv_lock_slow_interruptible(obj->resv,
acquire_ctx);
if (ret) {
- ww_acquire_
done
(acquire_ctx);
+ ww_acquire_
fini
(acquire_ctx);
return ret;
}
}
@@
-1558,7
+1558,7
@@
retry:
goto retry;
}
- ww_acquire_
done
(acquire_ctx);
+ ww_acquire_
fini
(acquire_ctx);
return ret;
}
}