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

Commit ce8ff099 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: i915_gem_object_create_from_data() doesn't require struct_mutex 



Both object creation and backing storage page allocation do not require
struct_mutex, so do not require the caller to take it.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170317194648.12468-1-chris@chris-wilson.co.uk


Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
parent 51a575d9

drivers/gpu/drm/i915/i915_gem.c

+1 −3
Original line number Diff line number Diff line
@@ -4961,9 +4961,7 @@ i915_gem_object_create_from_data(struct drm_i915_private *dev_priv, 
	if (IS_ERR(obj))

		return obj;



	ret = i915_gem_object_set_to_cpu_domain(obj, true);

	if (ret)

		goto fail;

	GEM_BUG_ON(obj->base.write_domain != I915_GEM_DOMAIN_CPU);



	ret = i915_gem_object_pin_pages(obj);

	if (ret)

drivers/gpu/drm/i915/intel_uc.c

+0 −2
Original line number Diff line number Diff line
@@ -376,9 +376,7 @@ void intel_uc_prepare_fw(struct drm_i915_private *dev_priv, 
			uc_fw->major_ver_found, uc_fw->minor_ver_found,

			uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted);



	mutex_lock(&dev_priv->drm.struct_mutex);

	obj = i915_gem_object_create_from_data(dev_priv, fw->data, fw->size);

	mutex_unlock(&dev_priv->drm.struct_mutex);

	if (IS_ERR_OR_NULL(obj)) {

		err = obj ? PTR_ERR(obj) : -ENOMEM;

		goto fail;