Commit 0de2cc0e authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Fix assert in i915_ggtt_pin 



Use lockdep_assert_not_held to simplify and correct the code. Otherwise
false positive are hit if lock state is uknown like after a previous
taint.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reported-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220429140757.651406-1-tvrtko.ursulin@linux.intel.com
parent 10dcf783

drivers/gpu/drm/i915/i915_vma.c

+1 −3
Original line number Diff line number Diff line
@@ -1562,9 +1562,7 @@ int i915_ggtt_pin(struct i915_vma *vma, struct i915_gem_ww_ctx *ww, 
	if (ww)

		return __i915_ggtt_pin(vma, ww, align, flags);



#ifdef CONFIG_LOCKDEP

	WARN_ON(dma_resv_held(vma->obj->base.resv));

#endif

	lockdep_assert_not_held(&vma->obj->base.resv->lock.base);



	for_i915_gem_ww(&_ww, err, true) {

		err = i915_gem_object_lock(vma->obj, &_ww);