Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebcdd39e authored by Matt Roper's avatar Matt Roper Committed by Daniel Vetter
Browse files

drm/i915: Add a couple WARN()'s to catch missing locks 



Add !mutex_is_locked() checks to intel_pin_and_fence_fb_obj() and
intel_unpin_fb_obj() to help catch failures to grab struct_mutex when
operating on fb objects.

Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 4c34574f

drivers/gpu/drm/i915/intel_display.c

+4 −0
Original line number Diff line number Diff line
@@ -2196,6 +2196,8 @@ intel_pin_and_fence_fb_obj(struct drm_device *dev, 
	u32 alignment;

	int ret;



	WARN_ON(!mutex_is_locked(&dev->struct_mutex));



	switch (obj->tiling_mode) {

	case I915_TILING_NONE:

		if (IS_BROADWATER(dev) || IS_CRESTLINE(dev))
@@ -2252,6 +2254,8 @@ intel_pin_and_fence_fb_obj(struct drm_device *dev, 


void intel_unpin_fb_obj(struct drm_i915_gem_object *obj)

{

	WARN_ON(!mutex_is_locked(&obj->base.dev->struct_mutex));



	i915_gem_object_unpin_fence(obj);

	i915_gem_object_unpin_from_display_plane(obj);

}