X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=drivers%2Fgpu%2Fdrm%2Fdrm_modeset_lock.c;h=6675b14284105cd639fb7fbb7ee9967cfcc38aa9;hb=5dfe5b2c714a5bea0908c1e00da0e8e00535f55c;hp=fba321ca434485d0f6f6d7898c84711eea47a577;hpb=db25f440f42eca380fcdb339f51cf73633e32485;p=firefly-linux-kernel-4.4.55.git

diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
index fba321ca4344..6675b1428410 100644
--- a/drivers/gpu/drm/drm_modeset_lock.c
+++ b/drivers/gpu/drm/drm_modeset_lock.c
@@ -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