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

Commit 6d3e7fdd authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Fixup locking WARN_ON mistake around gem_object_free_unlocked 



Embarrassingly while fixing up the old paths for i915 I managed to
misplace a locking check for the new _unlocked paths. That's what I
get for not retesting on radeon.

Fixes: 9f0ba539 ("drm/gem: support BO freeing without dev->struct_mutex")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Alex Deucher <alexdeucher@gmail.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Tested-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent 1d657c58

drivers/gpu/drm/drm_gem.c

+5 −4
Original line number Diff line number Diff line
@@ -804,13 +804,14 @@ drm_gem_object_free(struct kref *kref) 
		container_of(kref, struct drm_gem_object, refcount);

	struct drm_device *dev = obj->dev;



	if (dev->driver->gem_free_object_unlocked) {

		dev->driver->gem_free_object_unlocked(obj);

	} else if (dev->driver->gem_free_object) {

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



	if (dev->driver->gem_free_object_unlocked)

		dev->driver->gem_free_object_unlocked(obj);

	else if (dev->driver->gem_free_object)

		dev->driver->gem_free_object(obj);

	}

}

EXPORT_SYMBOL(drm_gem_object_free);



/**