Commit 825926d8 authored Aug 27, 2015 by Maarten Lankhorst Committed by Daniel Vetter Sep 08, 2015

drm/atomic: Make sure lock is held in trylock contexts.



This will make sure we get a lockdep spat in all cases
even if the context is a complete garbage pointer.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 53edb2c6

drivers/gpu/drm/drm_modeset_lock.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -307,6 +307,8 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
		WARN_ON(ctx->contended);

		if (ctx->trylock_only) {
		lockdep_assert_held(&ctx->ww_ctx);

		if (!ww_mutex_trylock(&lock->mutex))
		return -EBUSY;
		else