diff options
| author |   jsg <jsg@openbsd.org> | 2020-06-08 04:47:57 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2020-06-08 04:47:57 +0000 |
| commit | c349dbc7938c71a30e13c1be4acc1976165f4630 (patch) | |
| tree | 8798187dfd7a927a15123e8dad31b782b074baa8 /sys/dev/pci/drm/include/linux/mutex.h | |
| parent | The errcheck() function treats an errno of ERANGE or EDOM as something (diff) | |
| download | wireguard-openbsd-c349dbc7938c71a30e13c1be4acc1976165f4630.tar.xz wireguard-openbsd-c349dbc7938c71a30e13c1be4acc1976165f4630.zip | |
update drm to linux 5.7
adds kernel support for
amdgpu: vega20, raven2, renoir, navi10, navi14
inteldrm: icelake, tigerlake
Thanks to the OpenBSD Foundation for sponsoring this work, kettenis@ for
helping, patrick@ for helping adapt rockchip drm and many developers for
testing.
Diffstat (limited to 'sys/dev/pci/drm/include/linux/mutex.h')
| -rw-r--r-- | sys/dev/pci/drm/include/linux/mutex.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/dev/pci/drm/include/linux/mutex.h b/sys/dev/pci/drm/include/linux/mutex.h index a1436f82228..5910b9743c0 100644 --- a/sys/dev/pci/drm/include/linux/mutex.h +++ b/sys/dev/pci/drm/include/linux/mutex.h @@ -11,6 +11,8 @@ #define DEFINE_MUTEX(x) struct rwlock x #define mutex_lock_interruptible(rwl) -rw_enter(rwl, RW_WRITE | RW_INTR) +#define mutex_lock_interruptible_nested(rwl, subc) \ + -rw_enter(rwl, RW_WRITE | RW_INTR) #define mutex_lock(rwl) rw_enter_write(rwl) #define mutex_lock_nest_lock(rwl, sub) rw_enter_write(rwl) #define mutex_lock_nested(rwl, sub) rw_enter_write(rwl) @@ -35,4 +37,6 @@ mutex_trylock_recursive(struct rwlock *rwl) return MUTEX_TRYLOCK_FAILED; } +int atomic_dec_and_mutex_lock(volatile int *, struct rwlock *); + #endif |