Merge tag 'drm-misc-next-2021-10-14' of git://anongit.freedesktop.org/drm/drm-misc...

[linux-2.6-microblaze.git] / drivers / gpu / drm / drm_modeset_lock.c

diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
index 62f6fe4..4d32b61 100644 (file)
--- a/drivers/gpu/drm/drm_modeset_lock.c
+++ b/drivers/gpu/drm/drm_modeset_lock.c
@@ -291,7 +291,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
        if (ctx->trylock_only) {
                lockdep_assert_held(&ctx->ww_ctx);
 
-               if (!ww_mutex_trylock(&lock->mutex))
+               if (!ww_mutex_trylock(&lock->mutex, NULL))
                        return -EBUSY;
                else
                        return 0;