diff options
| author |   Maxime Ripard <maxime@cerno.tech> | 2021-10-25 15:27:56 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2021-10-25 15:27:56 +0200 |
| commit | 736638246ec215f999dd132334d2d7c49bcb85c7 (patch) | |
| tree | 6c79e96f8dccb0514d918cf279915695ffb3aeea /include/linux/dma-resv.h | |
| parent | drm: use new iterator in drm_gem_plane_helper_prepare_fb v3 (diff) | |
| parent | Merge tag 'drm-intel-gt-next-2021-10-21' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (diff) | |
| download | linux-dev-736638246ec215f999dd132334d2d7c49bcb85c7.tar.xz linux-dev-736638246ec215f999dd132334d2d7c49bcb85c7.zip | |
Merge drm/drm-next into drm-misc-next
drm-misc-next hasn't been updated in a while and I need a post -rc2
state to merge some vc4 patches.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'include/linux/dma-resv.h')
| -rw-r--r-- | include/linux/dma-resv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dma-resv.h b/include/linux/dma-resv.h index 45f1d4812a37..dbd235ab447f 100644 --- a/include/linux/dma-resv.h +++ b/include/linux/dma-resv.h @@ -380,7 +380,7 @@ static inline int dma_resv_lock_slow_interruptible(struct dma_resv *obj, */ static inline bool __must_check dma_resv_trylock(struct dma_resv *obj) { - return ww_mutex_trylock(&obj->lock); + return ww_mutex_trylock(&obj->lock, NULL); } /** |