Skip to contentSkip to conversation

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

PATCH Applied Maarten Lankhorst 3 participants 3 messages Aug 27, 2015 – Sep 2, 2015

Subsystems (2)
DRM drivers DRM misc
lore
Share & tools
lore

Maarten Lankhorst

author maintainer
#0 lore raw

PATCH 1/1 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 <[email protected]>

---

drivers/gpu/drm/drm_modeset_lock.c +2 -0
index 9abee87c1501..7c9ca2381d78 100644
@@ -305,6 +305,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

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Tested-by on v1 1/1
#1 lore raw
Tested-by Intel Graphics QA PRTS (Patch Regression Test System Contact: [email protected])

Task id: 7273 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied

ILK                                  302/302              302/302
SNB                                  315/315              315/315
IVB                                  336/336              336/336

BYT -2 283/283 281/283
HSW 378/378 378/378
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*BYT igt@gem_partial_pwrite_pread@reads-uncached PASS(1) FAIL(1)
*BYT igt@gem_tiled_partial_pwrite_pread@reads PASS(1) FAIL(1)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Applied
#2 lore raw
In reply to Maarten Lankhorst
Quoted 4 lines · Maarten Lankhorst

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 <[email protected]>

Applied to drm-misc, thanks.
-Daniel

Quoted 19 lines

---

drivers/gpu/drm/drm_modeset_lock.c +2 -0
index 9abee87c1501..7c9ca2381d78 100644
@@ -305,6 +305,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

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx